Clean up game_sa project (Round 9, PR #2804)

Author: Merlin

Client/game_sa/C3DMarkerSA.cpp

@@ -128,20 +128,6 @@ void C3DMarkerSA::Disable()
     this->GetInterface()->m_nIdentifier = 0;
 }
 
-void C3DMarkerSA::DeleteMarkerObject()
-{
-    if (this->GetInterface()->m_pRwObject)
-    {
-        DWORD dwFunc = FUNC_DeleteMarkerObject;
-        DWORD dwThis = (DWORD)this->GetInterface();
-        _asm
-        {
-            mov     ecx, dwThis
-            call    dwFunc
-        }
-    }
-}
-
 void C3DMarkerSA::Reset()
 {
     this->internalInterface->m_lastPosition = this->internalInterface->m_mat.vPos;

Client/game_sa/C3DMarkerSA.h

@@ -14,8 +14,6 @@
 #include <game/C3DMarker.h>
 #include <CMatrix_Pad.h>
 
-#define FUNC_DeleteMarkerObject 0x722390
-
 class C3DMarkerSAInterface
 {
 public:
@@ -78,7 +76,6 @@ class C3DMarkerSA : public C3DMarker
     void     SetPulseFraction(float fPulseFraction);            // doesn't work propperly (not virtualed)
     float    GetPulseFraction();
     void     Disable();
-    void     DeleteMarkerObject();
     void     Reset();
     void     SetActive() { this->internalInterface->m_bIsUsed = true; };
     RpClump* GetRwObject() { return this->internalInterface->m_pRwObject; }

Client/game_sa/CAnimBlendAssocGroupSA.cpp

@@ -10,9 +10,12 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include <core/CCoreInterface.h>
 #include "CAnimBlendAssocGroupSA.h"
 #include "CAnimBlockSA.h"
 
+extern CCoreInterface* g_pCore;
+
 CAnimBlendAssocGroupSA::CAnimBlendAssocGroupSA(CAnimBlendAssocGroupSAInterface* pInterface)
 {
     m_pInterface = pInterface;

Client/game_sa/CAnimBlendAssocGroupSA.h

@@ -14,6 +14,7 @@
 #include <game/CAnimBlendAssocGroup.h>
 #include "CAnimBlendStaticAssociationSA.h"
 
+class CAnimBlendAssociationSAInterface;
 class CAnimBlockSA;
 class CAnimBlockSAInterface;
 class CAnimManagerSA;

Client/game_sa/CAnimBlendAssociationSA.cpp

@@ -13,6 +13,7 @@
 #include "CAnimBlendAssociationSA.h"
 #include "CAnimBlendHierarchySA.h"
 #include "CAnimManagerSA.h"
+#include "CGameSA.h"
 
 extern CGameSA* pGame;
 

Client/game_sa/CAnimBlendAssociationSA.h

@@ -13,6 +13,7 @@
 
 #pragma once
 
+#include <CVector.h>
 #include <game/RenderWare.h>
 #include <game/CAnimBlendAssociation.h>
 #include "CAnimBlendNodeSA.h"

Client/game_sa/CAnimBlockSA.cpp

@@ -13,6 +13,9 @@
 #include "CAnimBlendHierarchySA.h"
 #include "CAnimBlockSA.h"
 #include "CAnimManagerSA.h"
+#include "CGameSA.h"
+
+extern CGameSA* pGame;
 
 int CAnimBlockSAInterface::GetIndex()
 {

Client/game_sa/CAnimManagerSA.cpp

@@ -11,12 +11,16 @@
 
 #include "StdInc.h"
 #include "CAnimBlendAssocGroupSA.h"
+#include "CAnimBlendAssociationSA.h"
 #include "CAnimBlendHierarchySA.h"
+#include "CAnimBlendSequenceSA.h"
 #include "CAnimBlockSA.h"
 #include "CAnimManagerSA.h"
-#include "CAnimBlendSequenceSA.h"
+#include "CGameSA.h"
 #include "CKeyGenSA.h"
 
+extern CGameSA* pGame;
+
 using std::list;
 
 CAnimManagerSA::CAnimManagerSA()

Client/game_sa/CAudioEngineSA.cpp

@@ -12,9 +12,12 @@
 #include "StdInc.h"
 #include "CAESoundManagerSA.h"
 #include "CAudioEngineSA.h"
+#include "CGameSA.h"
 #include "CPhysicalSA.h"
 #include "CSettingsSA.h"
 
+extern CGameSA* pGame;
+
 #define HOOKPOS_CAEAmbienceTrackManager_CheckForPause       0x4D6E21
 DWORD RETURN_CAEAmbienceTrackManager_CheckForPause = 0x4D6E27;
 void  HOOK_CAEAmbienceTrackManager_CheckForPause();

Client/game_sa/CAutomobileSA.cpp

@@ -87,32 +87,6 @@ bool CAutomobileSA::IsComponentPresent(int iComponentID)
     return bReturn;
 }
 
-void CAutomobileSA::ResetSuspension()
-{
-    DWORD dwThis = (DWORD)GetInterface();
-    DWORD dwFunc = FUNC_CAutomobile_ResetSuspension;
-
-    _asm
-    {
-        mov     ecx, dwThis
-        call    dwFunc
-    }
-}
-
-void CAutomobileSA::SetTaxiLight(bool bState)
-{
-    DWORD dwThis = (DWORD)GetInterface();
-    DWORD dwState = (DWORD)bState;
-    DWORD dwFunc = FUNC_CAutomobile_SetTaxiLight;
-
-    _asm
-    {
-        mov     ecx, dwThis
-        push    dwState
-        call    dwFunc
-    }
-}
-
 CPhysical* CAutomobileSA::SpawnFlyingComponent(int iCarNodeIndex, int iUnknown)
 {
     DWORD      dwThis = (DWORD)GetInterface();