Commit b6264f5a authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Fixing problems

parent de5e675a
......@@ -37,7 +37,7 @@
#define VA_MUTAL_EXCLUDE VistaMutexLock oLock( m_oCommandMutex )
// State checking macro
#define VA_REQUIRE_CONNECTED { if( m_pParent->GetConnected() == false ) VA_EXCEPT2( MODAL_ERROR, "Not connected." ); }
#define VA_REQUIRE_CONNECTED { if( m_pParent->IsConnected() == false ) VA_EXCEPT2( MODAL_ERROR, "Not connected." ); }
////////////////////////////////////////////////
......@@ -1031,20 +1031,6 @@ public:
return m_pProtocol->ClientGetSoundPortalInfo( iID );
};
inline std::string GetSoundPortalName( const int iID ) const
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientGetSoundPortalName( iID );
};
inline void SetSoundPortalName( const int iID, const std::string& sName )
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
m_pProtocol->ClientSetSoundPortalName( iID, sName );
};
inline void SetSoundPortalMaterial( const int iSoundPortalID, const int iMaterialID )
{
VA_REQUIRE_CONNECTED;
......
......@@ -732,8 +732,8 @@ void CVANetMessage::ReadVAStruct( CVAStruct& oStruct )
int iNumSamples = ReadInt();
oStruct[ sKeyName ] = CVASampleBuffer( iNumSamples, false );
CVASampleBuffer& oSampleBuffer( oStruct[ sKeyName.c_str() ] );
for( int i = 0; i < iNumSamples; i++ )
oSampleBuffer.vfSamples[ i ] = ReadFloat();
for( int j= 0; j < iNumSamples; j++ )
oSampleBuffer.vfSamples[ j ] = ReadFloat();
}
break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment