Cleanup multiplayer_sa project (Round 2, PR #3144)

multitheftauto · Aug 6, 2023 · 3898204 · 3898204
1 parent 10ad0db
commit 3898204
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 83 deletions.
diff --git a/Client/multiplayer_sa/CMultiplayerSA.h b/Client/multiplayer_sa/CMultiplayerSA.h
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <game/CGame.h>
-#include <multiplayer/CMultiplayer.h>
 
 #include "multiplayersa_init.h"
 #include "CLimitsSA.h"

diff --git a/Client/multiplayer_sa/CMultiplayerSA_CrashFixHacks.cpp b/Client/multiplayer_sa/CMultiplayerSA_CrashFixHacks.cpp
@@ -12,7 +12,6 @@
 #include "StdInc.h"
 #include <game/CAnimManager.h>
 #include "../game_sa/CTrainSA.h"
-#include "../game_sa/CTasksSA.h"
 #include "../game_sa/CAnimBlendSequenceSA.h"
 #include "../game_sa/CAnimBlendHierarchySA.h"
 #include "../game_sa/TaskBasicSA.h"

diff --git a/Client/multiplayer_sa/CMultiplayerSA_CustomAnimations.cpp b/Client/multiplayer_sa/CMultiplayerSA_CustomAnimations.cpp
@@ -11,9 +11,6 @@
 #include "StdInc.h"
 
 #include <../game_sa/CAnimBlendAssocGroupSA.h>
-#include <../game_sa/CAnimBlendAssociationSA.h>
-#include <../game_sa/CAnimBlendHierarchySA.h>
-#include <../game_sa/CAnimBlendStaticAssociationSA.h>
 #include <../game_sa/CAnimManagerSA.h>
 
 DWORD FUNC_CAnimBlendAssociation__ReferenceAnimBlock = 0x4CEA50;

diff --git a/Client/multiplayer_sa/CRemoteDataSA.cpp b/Client/multiplayer_sa/CRemoteDataSA.cpp
@@ -13,7 +13,6 @@
 
 // These includes have to be fixed!
 #include "../game_sa/CPedSA.h"
-#include "../game_sa/CVehicleSA.h"
 
 CPools*                                      CRemoteDataSA::m_pPools;
 std::map<CPlayerPed*, CRemoteDataStorageSA*> CRemoteDataSA::m_RemoteData;

diff --git a/Client/multiplayer_sa/Common.h b/Client/multiplayer_sa/Common.h
diff --git a/Client/multiplayer_sa/StdInc.h b/Client/multiplayer_sa/StdInc.h
@@ -11,28 +11,16 @@
 #include "SharedUtil.MemAccess.h"
 #include <stdio.h>
 
-#include <algorithm>
-#include <list>
-#include <map>
-#include <string>
-#include <vector>
-
 // SDK includes
 #include <core/CCoreInterface.h>
-#include <game/CGame.h>
-#include <CMatrix_Pad.h>
 #include <version.h>
 
 // Multiplayer includes
 #include "multiplayersa_init.h"
 #include "multiplayer_keysync.h"
 #include "multiplayer_hooksystem.h"
-#include "multiplayer_shotsync.h"
-#include "CMultiplayerSA.h"
-#include "CRemoteDataSA.h"
 #include "..\game_sa\CCameraSA.h"
 #include "..\game_sa\CEntitySA.h"
 #include "..\game_sa\CPedSA.h"
-#include "..\core\CCrashDumpWriter.h"
 
 extern CMultiplayerSA* pMultiplayer;
diff --git a/Client/multiplayer_sa/multiplayer_keysync.cpp b/Client/multiplayer_sa/multiplayer_keysync.cpp
@@ -10,16 +10,8 @@
  *****************************************************************************/
 
 #include "StdInc.h"
-#define MULTIPLAYER_STATS
 
 #include <game/CWeaponStatManager.h>
-#include <game/CWeaponStat.h>
-
-// These includes have to be fixed!
-#include "../game_sa/CPlayerInfoSA.h"
-#include "../game_sa/CPedSA.h"
-#include "../game_sa/CVehicleSA.h"
-#include "../game_sa/CPadSA.h"
 
 extern CMultiplayerSA* pMultiplayer;
 
@@ -30,13 +22,6 @@ DWORD dwParameter = 0;
 
 BOOL bRadioHackInstalled = FALSE;
 bool b1stPersonWeaponModeHackInPlace = false;
-
-/*
-GTA_CONTROLSET RemotePlayerKeys[MAX_PEDS];
-GTA_CONTROLSET SavedLocalPlayerKeys;
-GTA_CONTROLSET *LocalPlayerKeys = (GTA_CONTROLSET *)VAR_Keystates;
-*/
-
 bool bNotInLocalContext = false;
 bool bMouseLookEnabled = true;
 bool bInfraredVisionEnabled = false;

diff --git a/Client/multiplayer_sa/multiplayer_shotsync.cpp b/Client/multiplayer_sa/multiplayer_shotsync.cpp
@@ -15,17 +15,12 @@
 #include <game/CProjectile.h>
 #include <game/CProjectileInfo.h>
 #include <game/CEventList.h>
-// These includes have to be fixed!
-#include "../game_sa/CPedSA.h"
 #include "../game_sa/CEventDamageSA.h"
-#include "../game_sa/CColPointSA.h"
 #include <net/SyncStructures.h>
 
 extern CMultiplayerSA* pMultiplayer;
 
-using std::list;
-
-list<CShotSyncData*> ShotSyncData;
+std::list<CShotSyncData*> ShotSyncData;
 CShotSyncData        LocalShotSyncData;
 
 float*                        fDirectionX;

diff --git a/Client/multiplayer_sa/multiplayersa_init.cpp b/Client/multiplayer_sa/multiplayersa_init.cpp
@@ -10,7 +10,6 @@
  *****************************************************************************/
 
 #include "StdInc.h"
-#include <net/CNet.h>
 #define DECLARE_PROFILER_SECTION_multiplayersa_init
 #include "profiler/SharedUtil.Profiler.h"