Add "soundEnable" parameter to createEffect function (#147)

ZReC · Justus H · commit a10305d90f96 · 2017-07-29T14:17:32.000+02:00
For the reason of this comment: Https://bugs.mtasa.com/view.php?id=8590#c25890 I was able to turn off the sound of the particles, as before solving the bug. With the tests I did it seems to work fine :)
diff --git a/Client/game_sa/CFxManagerSA.cpp b/Client/game_sa/CFxManagerSA.cpp
@@ -12,12 +12,13 @@
 #include "StdInc.h"
 
 
-CFxSystem* CFxManagerSA::CreateFxSystem( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck )
+CFxSystem* CFxManagerSA::CreateFxSystem( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck, bool bSoundEnable )
 {
     const CVector * pvecPosition = &vecPosition;
     DWORD dwThis = ( DWORD ) m_pInterface;
     DWORD dwFunc = FUNC_FxManager_c__CreateFxSystem;
     DWORD dwReturn = 0;
+
     _asm
     {
         mov     ecx, dwThis
@@ -28,8 +29,12 @@ CFxSystem* CFxManagerSA::CreateFxSystem( const char * szBlueprint, const CVector
         call    dwFunc
         mov     dwReturn, eax
     }
+
     if ( dwReturn != 0 )
     {
+        if ( !bSoundEnable )
+            * ( DWORD * )( ( DWORD )dwReturn + 0x100 ) = NULL;
+
         CFxSystemSA* pFxSystemSA = new CFxSystemSA((CFxSystemSAInterface*)dwReturn);
         return pFxSystemSA;
     }
diff --git a/Client/game_sa/CFxManagerSA.h b/Client/game_sa/CFxManagerSA.h
@@ -62,7 +62,7 @@ class CFxManagerSA : public CFxManager
 public:
                     CFxManagerSA( CFxManagerSAInterface * pInterface )    { m_pInterface = pInterface; }
     // CFxManager interface
-    CFxSystem*      CreateFxSystem( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck );
+    CFxSystem*      CreateFxSystem( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck, bool bSoundEnable );
     void            DestroyFxSystem( CFxSystem* pFxSystem );
     void            OnFxSystemSAInterfaceDestroyed ( CFxSystemSAInterface* pFxSystemSAInterface );
 
diff --git a/Client/mods/deathmatch/logic/CClientEffectManager.cpp b/Client/mods/deathmatch/logic/CClientEffectManager.cpp
@@ -33,12 +33,12 @@ void CClientEffectManager::DeleteAll( )
     m_bCanRemoveFromList = true;
 }
 
-CClientEffect * CClientEffectManager::Create(const SString& strEffectName, const CVector &vecPosition, ElementID ID)
+CClientEffect * CClientEffectManager::Create(const SString& strEffectName, const CVector &vecPosition, ElementID ID, bool bSoundEnable )
 {
     if ( strEffectName.length () >= 0x60 )
         return NULL;
 
-    CFxSystem * pFxSA = g_pGame->GetFxManager()->CreateFxSystem ( strEffectName, vecPosition, NULL, true );
+    CFxSystem * pFxSA = g_pGame->GetFxManager()->CreateFxSystem ( strEffectName, vecPosition, NULL, true, bSoundEnable );
     if ( pFxSA == NULL )
         return NULL; // GTA was unable to create the effect (e.g. wrong effect name)
 
@@ -95,4 +95,4 @@ void CClientEffectManager::SAEffectDestroyed ( void *pFxSAInterface )
 
     pFx->SetFxSystem ( NULL );
     g_pClientGame->GetElementDeleter()->Delete(pFx);
-}
+}
diff --git a/Client/mods/deathmatch/logic/CClientEffectManager.h b/Client/mods/deathmatch/logic/CClientEffectManager.h
@@ -21,7 +21,7 @@ class CClientEffectManager
     friend class CClientManager;
 
 public:
-    CClientEffect*                  Create                  ( const SString& strEffectName, const CVector& vecPosition, ElementID ID );
+    CClientEffect*                  Create                  ( const SString& strEffectName, const CVector& vecPosition, ElementID ID, bool bSoundEnable );
     void                            SAEffectDestroyed       ( void * pFxSAInterface );
     void                            DeleteAll               ( void );
 
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -7454,9 +7454,9 @@ bool CStaticFunctionDefinitions::FxAddFootSplash ( CVector & vecPosition )
     return true;
 }
 
-CClientEffect* CStaticFunctionDefinitions::CreateEffect(CResource& Resource, const SString &strFxName, const CVector &vecPosition)
+CClientEffect* CStaticFunctionDefinitions::CreateEffect( CResource& Resource, const SString &strFxName, const CVector &vecPosition, bool bSoundEnable )
 {
-    CClientEffect * pFx =  m_pManager->GetEffectManager()->Create(strFxName, vecPosition, INVALID_ELEMENT_ID);
+    CClientEffect * pFx =  m_pManager->GetEffectManager()->Create( strFxName, vecPosition, INVALID_ELEMENT_ID, bSoundEnable );
     if ( pFx )
         pFx->SetParent ( Resource.GetResourceDynamicEntity () );
     return pFx;
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h
@@ -636,7 +636,7 @@ class CStaticFunctionDefinitions
     static bool                         FxAddWaterSplash                    ( CVector & vecPosition );
     static bool                         FxAddBulletSplash                   ( CVector & vecPosition );
     static bool                         FxAddFootSplash                     ( CVector & vecPosition );
-    static CClientEffect*               CreateEffect                        ( CResource& Resource, const SString& strFxName, const CVector& vecPosition );
+    static CClientEffect*               CreateEffect                        ( CResource& Resource, const SString& strFxName, const CVector& vecPosition, bool bSoundEnable );
 
     // Sound funcs
     static CClientSound*                PlaySound                           ( CResource* pResource, const SString& strSound, bool bIsURL, bool bLoop, bool bThrottle );
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp
@@ -490,18 +490,20 @@ int CLuaEffectDefs::fxAddFootSplash ( lua_State* luaVM )
 
 int CLuaEffectDefs::CreateEffect ( lua_State* luaVM )
 {
-    // bool createEffect ( string fxName, float posX, float posY, float posZ[, float rotX, float rotY, float rotZ, float drawDistance] )
+    // bool createEffect ( string fxName, float posX, float posY, float posZ[, float rotX, float rotY, float rotZ, float drawDistance, bool soundEnable = false] )
 
     CVector vecPosition;
     CVector vecRotation;
     SString strFxName;
-    float fDrawDistance;
+    float   fDrawDistance;
+    bool    bSoundEnable;
 
     CScriptArgReader argStream ( luaVM );
     argStream.ReadString ( strFxName );
     argStream.ReadVector3D ( vecPosition );
     argStream.ReadVector3D ( vecRotation, CVector ( 0, 0, 0 ) );
     argStream.ReadNumber ( fDrawDistance, 0 );
+    argStream.ReadBool ( bSoundEnable, false );
 
     if ( !argStream.HasErrors () )
     {
@@ -512,7 +514,7 @@ int CLuaEffectDefs::CreateEffect ( lua_State* luaVM )
             if ( pResource )
             {
                 // Create it and return it
-                CClientEffect * pFx = CStaticFunctionDefinitions::CreateEffect ( *pResource, strFxName, vecPosition );
+                CClientEffect * pFx = CStaticFunctionDefinitions::CreateEffect ( *pResource, strFxName, vecPosition, bSoundEnable );
                 if ( pFx != NULL )
                 {
                     pFx->SetRotationDegrees ( vecRotation );
diff --git a/Client/sdk/game/CFxManager.h b/Client/sdk/game/CFxManager.h
@@ -20,7 +20,7 @@ class CFxSystemSAInterface;
 class CFxManager
 {
 public:
-    virtual CFxSystem* CreateFxSystem ( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck ) = 0;
+    virtual CFxSystem* CreateFxSystem ( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck, bool bSoundEnable ) = 0;
     virtual void       DestroyFxSystem ( CFxSystem* pFxSystem ) = 0;
     virtual void       OnFxSystemSAInterfaceDestroyed ( CFxSystemSAInterface* pFxSystemSAInterface ) = 0;
 };

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,13 @@`
`12`	`12`	`#include "StdInc.h"`
`13`	`13`
`14`	`14`
`15`		`-CFxSystem* CFxManagerSA::CreateFxSystem( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck )`
	`15`	`+CFxSystem* CFxManagerSA::CreateFxSystem( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck, bool bSoundEnable )`
`16`	`16`	`{`
`17`	`17`	`const CVector * pvecPosition = &vecPosition;`
`18`	`18`	`DWORD dwThis = ( DWORD ) m_pInterface;`
`19`	`19`	`DWORD dwFunc = FUNC_FxManager_c__CreateFxSystem;`
`20`	`20`	`DWORD dwReturn = 0;`
	`21`	`+`
`21`	`22`	`_asm`
`22`	`23`	`{`
`23`	`24`	`mov ecx, dwThis`
`@@ -28,8 +29,12 @@ CFxSystem* CFxManagerSA::CreateFxSystem( const char * szBlueprint, const CVector`
`28`	`29`	`call dwFunc`
`29`	`30`	`mov dwReturn, eax`
`30`	`31`	`}`
	`32`	`+`
`31`	`33`	`if ( dwReturn != 0 )`
`32`	`34`	`{`
	`35`	`+ if ( !bSoundEnable )`
	`36`	`+ * ( DWORD * )( ( DWORD )dwReturn + 0x100 ) = NULL;`
	`37`	`+`
`33`	`38`	`CFxSystemSA* pFxSystemSA = new CFxSystemSA((CFxSystemSAInterface*)dwReturn);`
`34`	`39`	`return pFxSystemSA;`
`35`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7454,9 +7454,9 @@ bool CStaticFunctionDefinitions::FxAddFootSplash ( CVector & vecPosition )`
`7454`	`7454`	`return true;`
`7455`	`7455`	`}`
`7456`	`7456`
`7457`		`-CClientEffect* CStaticFunctionDefinitions::CreateEffect(CResource& Resource, const SString &strFxName, const CVector &vecPosition)`
	`7457`	`+CClientEffect* CStaticFunctionDefinitions::CreateEffect( CResource& Resource, const SString &strFxName, const CVector &vecPosition, bool bSoundEnable )`
`7458`	`7458`	`{`
`7459`		`- CClientEffect * pFx = m_pManager->GetEffectManager()->Create(strFxName, vecPosition, INVALID_ELEMENT_ID);`
	`7459`	`+ CClientEffect * pFx = m_pManager->GetEffectManager()->Create( strFxName, vecPosition, INVALID_ELEMENT_ID, bSoundEnable );`
`7460`	`7460`	`if ( pFx )`
`7461`	`7461`	`pFx->SetParent ( Resource.GetResourceDynamicEntity () );`
`7462`	`7462`	`return pFx;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class CFxSystemSAInterface;`
`20`	`20`	`class CFxManager`
`21`	`21`	`{`
`22`	`22`	`public:`
`23`		`- virtual CFxSystem* CreateFxSystem ( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck ) = 0;`
	`23`	`+ virtual CFxSystem* CreateFxSystem ( const char * szBlueprint, const CVector & vecPosition, RwMatrix * pRwMatrixTag, unsigned char bSkipCameraFrustumCheck, bool bSoundEnable ) = 0;`
`24`	`24`	`virtual void DestroyFxSystem ( CFxSystem* pFxSystem ) = 0;`
`25`	`25`	`virtual void OnFxSystemSAInterfaceDestroyed ( CFxSystemSAInterface* pFxSystemSAInterface ) = 0;`
`26`	`26`	`};`