Merge pull request #248 from Nmzik/master

CPopulation::Initialise() && CGame::Process() && CGame::ReloadIPLs()
GTAmodding · Oct 20, 2019 · 0759dbc1e1acc34fbc2ded0a186ec8fa85530a30 · 0759dbc
2 parents 9d41407 + 86284ee
commit 0759dbc1e1acc34fbc2ded0a186ec8fa85530a30
diff --git a/src/control/AccidentManager.cpp b/src/control/AccidentManager.cpp
@@ -6,6 +6,8 @@
 
 CAccidentManager& gAccidentManager = *(CAccidentManager*)0x87FD10;
 
+WRAPPER void CAccidentManager::Update(void) { EAXJMP(0x456710); }
+
 uint16 CAccidentManager::CountActiveAccidents()
 {
 	uint16 accidents = 0;

diff --git a/src/control/AccidentManager.h b/src/control/AccidentManager.h
@@ -22,6 +22,7 @@ class CAccidentManager
 public:
 	uint16 CountActiveAccidents();
 	CAccident* FindNearestAccident(CVector, float*);
+	void Update(void);
 };
 
 extern CAccidentManager& gAccidentManager;
diff --git a/src/control/Cranes.cpp b/src/control/Cranes.cpp
@@ -5,4 +5,6 @@
 WRAPPER bool CCranes::IsThisCarBeingTargettedByAnyCrane(CVehicle*) { EAXJMP(0x5451E0); }
 WRAPPER bool CCranes::IsThisCarBeingCarriedByAnyCrane(CVehicle*) { EAXJMP(0x545190); }
 WRAPPER void CCranes::ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float) { EAXJMP(0x543650); }
-WRAPPER void CCranes::DeActivateCrane(float, float) { EAXJMP(0x543890); }
+WRAPPER void CCranes::DeActivateCrane(float, float) { EAXJMP(0x543890); }
+WRAPPER void CCranes::InitCranes(void) { EAXJMP(0x543360); }
+WRAPPER void CCranes::UpdateCranes(void) { EAXJMP(0x5439E0); }
diff --git a/src/control/Cranes.h b/src/control/Cranes.h
@@ -10,4 +10,6 @@ class CCranes
 	static bool IsThisCarBeingCarriedByAnyCrane(CVehicle*);
 	static void ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float);
 	static void DeActivateCrane(float, float);
+	static void InitCranes(void);
+	static void UpdateCranes(void);
 };
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
@@ -25,6 +25,9 @@ bool &CGarages::PlayerInGarage = *(bool *)0x95CD83;
 int32 &CGarages::PoliceCarsCollected = *(int32 *)0x941444;
 uint32 &CGarages::GarageToBeTidied = *(uint32 *)0x623570;
 
+WRAPPER void CGarages::Init(void) { EAXJMP(0x421C60); }
+WRAPPER void CGarages::Update(void) { EAXJMP(0x421E40); }
+
 bool
 CGarages::IsModelIndexADoor(uint32 id)
 {
@@ -116,4 +119,4 @@ void CGarages::PrintMessages()
 		}
 	}
 }
-#endif
+#endif
diff --git a/src/control/Garages.h b/src/control/Garages.h
@@ -28,4 +28,6 @@ class CGarages
 	static bool IsPointWithinHideOutGarage(CVector&);
 	static bool IsPointWithinAnyGarage(CVector&);
 	static void PlayerArrestedOrDied();
+	static void Init(void);
+	static void Update(void);
 };
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
@@ -15,6 +15,8 @@ CPhone *&CPhoneInfo::pickedUpPhone = *(CPhone**)0x6283B0;
 bool &CPhoneInfo::isPhoneBeingPickedUp = *(bool*)0x6283B4;
 CPed *&CPhoneInfo::pedWhoPickingUpPhone = *(CPed**)0x6283B8;
 
+WRAPPER void CPhoneInfo::Update(void) { EAXJMP(0x42F7A0); }
+
 int
 CPhoneInfo::FindNearestFreePhone(CVector *pos)
 {

diff --git a/src/control/Phones.h b/src/control/Phones.h
@@ -56,6 +56,7 @@ class CPhoneInfo {
 	int GrabPhone(float, float);
 	void Initialise(void);
 	void Shutdown(void);
+	void Update(void);
 };
 
 extern CPhoneInfo &gPhoneInfo;

diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
@@ -47,6 +47,7 @@ uint8 aWeaponBlues[] = { 0, 0, 255, 0, 255, 255, 0, 128, 255, 0, 255, 0, 128, 25
 float aWeaponScale[] = { 1.0f, 2.0f, 1.5f, 1.0f, 1.0f, 1.5f, 1.0f, 2.0f, 1.0f, 2.0f, 2.5f, 1.0f, 1.0f, 1.0f, 1.0f };
 
 WRAPPER void CPacManPickups::Render(void) { EAXJMP(0x432F60); }
+WRAPPER void CPacManPickups::Update(void) { EAXJMP(0x432800); }
 
 
 void

diff --git a/src/control/Pickups.h b/src/control/Pickups.h
@@ -106,4 +106,5 @@ class CPacManPickups
 {
 public:
 	static void Render(void);
+	static void Update(void);
 };
diff --git a/src/control/Population.cpp b/src/control/Population.cpp
@@ -11,15 +11,74 @@ int32 &CPopulation::m_AllRandomPedsThisType = *(int32*)0x5FA570;
 float &CPopulation::PedDensityMultiplier = *(float*)0x5FA56C;
 uint32 &CPopulation::ms_nTotalMissionPeds = *(uint32*)0x8F5F70;
 int32 &CPopulation::MaxNumberOfPedsInUse = *(int32*)0x5FA574;
+uint32& CPopulation::ms_nNumCivMale = *(uint32*)0x8F2548;
+uint32& CPopulation::ms_nNumCivFemale = *(uint32*)0x8F5F44;
+uint32& CPopulation::ms_nNumCop = *(uint32*)0x885AFC;
+bool& CPopulation::bZoneChangeHasHappened = *(bool*)0x95CD79;
+uint32& CPopulation::ms_nNumEmergency = *(uint32*)0x94071C;
+uint32& CPopulation::m_CountDownToPedsAtStart = *(uint32*)0x95CD4F;
+uint32& CPopulation::ms_nNumGang1 = *(uint32*)0x8F1B1C;
+uint32& CPopulation::ms_nNumGang2 = *(uint32*)0x8F1B14;
+uint32& CPopulation::ms_nTotalPeds = *(uint32*)0x95CB50;
+uint32& CPopulation::ms_nNumGang3 = *(uint32*)0x8F2548;
+uint32& CPopulation::ms_nTotalGangPeds = *(uint32*)0x885AF0;
+uint32& CPopulation::ms_nNumGang4 = *(uint32*)0x8F1B2C;
+uint32& CPopulation::ms_nTotalCivPeds = *(uint32*)0x8F2C3C;
+uint32& CPopulation::ms_nNumGang5 = *(uint32*)0x8F1B30;
+uint32& CPopulation::ms_nNumDummy = *(uint32*)0x8F1A98;
+uint32& CPopulation::ms_nNumGang6 = *(uint32*)0x8F1B20;
+uint32& CPopulation::ms_nNumGang9 = *(uint32*)0x8F1B10;
+uint32& CPopulation::ms_nNumGang7 = *(uint32*)0x8F1B28;
+uint32& CPopulation::ms_nNumGang8 = *(uint32*)0x8F1B0C;
 
+WRAPPER void CPopulation::Update(void) { EAXJMP(0x4F39A0); }
+WRAPPER void CPopulation::LoadPedGroups() { EAXJMP(0x4F3870); }
 WRAPPER void CPopulation::UpdatePedCount(uint32, bool) { EAXJMP(0x4F5A60); }
 WRAPPER void CPopulation::DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool) { EAXJMP(0x4F6200); }
 WRAPPER CPed *CPopulation::AddPedInCar(CVehicle *vehicle) { EAXJMP(0x4F5800); }
 WRAPPER bool CPopulation::IsPointInSafeZone(CVector *coors) { EAXJMP(0x4F60C0); }
 
+void
+CPopulation::Initialise()
+{
+	debug("Initialising CPopulation...\n");
+
+	ms_nNumCivMale = 0;
+	m_AllRandomPedsThisType = -1;
+	ms_nNumCivFemale = 0;
+	PedDensityMultiplier = 1.0;
+	ms_nNumCop = 0;
+	bZoneChangeHasHappened = 0;
+	ms_nNumEmergency = 0;
+	m_CountDownToPedsAtStart = 2;
+	ms_nNumGang1 = 0;
+	ms_nTotalMissionPeds = 0;
+	ms_nNumGang2 = 0;
+	ms_nTotalPeds = 0;
+	ms_nNumGang3 = 0;
+	ms_nTotalGangPeds = 0;
+	ms_nNumGang4 = 0;
+	ms_nTotalCivPeds = 0;
+	ms_nNumGang5 = 0;
+	ms_nNumDummy = 0;
+	ms_nNumGang6 = 0;
+	ms_nNumGang9 = 0;
+	ms_nNumGang7 = 0;
+	ms_nNumGang8 = 0;
+
+	LoadPedGroups();
+	DealWithZoneChange(LEVEL_COMMERCIAL, LEVEL_INDUSTRIAL, true);
+
+	debug("CPopulation ready\n");
+}
+
 void
 CPopulation::RemovePed(CEntity* ent)
 {
 	CWorld::Remove(ent);
 	delete ent;
 }
+
+STARTPATCHES
+InjectHook(0x4F3770, CPopulation::Initialise, PATCH_JUMP);
+ENDPATCHES
diff --git a/src/control/Population.h b/src/control/Population.h
@@ -19,7 +19,29 @@ class CPopulation
 	static float &PedDensityMultiplier;
 	static uint32 &ms_nTotalMissionPeds;
 	static int32 &MaxNumberOfPedsInUse;
+	static uint32& ms_nNumCivMale;
+	static uint32 &ms_nNumCivFemale;
+	static uint32 &ms_nNumCop;
+	static bool &bZoneChangeHasHappened;
+	static uint32 &ms_nNumEmergency;
+	static uint32& m_CountDownToPedsAtStart;
+	static uint32& ms_nNumGang1;
+	static uint32& ms_nNumGang2;
+	static uint32& ms_nTotalPeds;
+	static uint32& ms_nNumGang3;
+	static uint32& ms_nTotalGangPeds;
+	static uint32& ms_nNumGang4;
+	static uint32& ms_nTotalCivPeds;
+	static uint32& ms_nNumGang5;
+	static uint32& ms_nNumDummy;
+	static uint32& ms_nNumGang6;
+	static uint32& ms_nNumGang9;
+	static uint32& ms_nNumGang7;
+	static uint32& ms_nNumGang8;
 
+	static void Initialise();
+	static void Update(void);
+	static void LoadPedGroups();
 	static void UpdatePedCount(uint32, bool);
 	static void DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool);
 	static CPed *AddPedInCar(CVehicle *vehicle);

diff --git a/src/control/Record.cpp b/src/control/Record.cpp
@@ -6,5 +6,8 @@ uint16 &CRecordDataForGame::RecordingState = *(uint16*)0x95CC24;
 
 uint8 &CRecordDataForChase::Status = *(uint8*)0x95CDCE;
 
+WRAPPER void CRecordDataForGame::SaveOrRetrieveDataForThisFrame(void) { EAXJMP(0x4341F0); }
+
+WRAPPER void CRecordDataForChase::SaveOrRetrieveDataForThisFrame(void) { EAXJMP(0x4347F0); }
 WRAPPER void CRecordDataForChase::ProcessControlCars(void) { EAXJMP(0x435540); }
 WRAPPER void CRecordDataForChase::SaveOrRetrieveCarPositions(void) { EAXJMP(0x434B20); }
diff --git a/src/control/Record.h b/src/control/Record.h
@@ -11,6 +11,7 @@ class CRecordDataForChase
 public:
 	static uint8 &Status;
 
+	static void SaveOrRetrieveDataForThisFrame(void);
 	static void ProcessControlCars(void);
 	static void SaveOrRetrieveCarPositions(void);
 };
@@ -20,4 +21,6 @@ class CRecordDataForGame
 {
 public:
 	static uint16 &RecordingState;
+
+	static void SaveOrRetrieveDataForThisFrame(void);
 };
diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp
@@ -2,4 +2,6 @@
 #include "patcher.h"
 #include "RoadBlocks.h"
 
+WRAPPER void CRoadBlocks::Init(void) { EAXJMP(0x436F50); }
 WRAPPER void CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle*, int32, int16) { EAXJMP(0x4376A0); }
+WRAPPER void CRoadBlocks::GenerateRoadBlocks(void) { EAXJMP(0x436FA0); }
diff --git a/src/control/RoadBlocks.h b/src/control/RoadBlocks.h
@@ -6,5 +6,7 @@ class CVehicle;
 class CRoadBlocks
 {
 public:
+	static void Init(void);
 	static void GenerateRoadBlockCopsForCar(CVehicle*, int32, int16);
+	static void GenerateRoadBlocks(void);
 };
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
@@ -0,0 +1,5 @@
+#include "common.h"
+#include "patcher.h"
+#include "SceneEdit.h"
+
+WRAPPER void CSceneEdit::Update(void) { EAXJMP(0x585570); }
diff --git a/src/control/SceneEdit.h b/src/control/SceneEdit.h
@@ -0,0 +1,7 @@
+#pragma once
+
+class CSceneEdit
+{
+public:
+	static void Update(void);
+};
diff --git a/src/control/TrafficLights.cpp b/src/control/TrafficLights.cpp
@@ -5,6 +5,7 @@
 #include "Vehicle.h"
 
 WRAPPER void CTrafficLights::DisplayActualLight(CEntity *ent) { EAXJMP(0x455800); }
+WRAPPER void CTrafficLights::ScanForLightsOnMap(void) { EAXJMP(0x454F40); }
 WRAPPER bool CTrafficLights::ShouldCarStopForLight(CVehicle*, bool) { EAXJMP(0x455350); }
 WRAPPER bool CTrafficLights::ShouldCarStopForBridge(CVehicle*) { EAXJMP(0x456460); }
 

diff --git a/src/control/TrafficLights.h b/src/control/TrafficLights.h
@@ -13,6 +13,7 @@ class CTrafficLights
 {
 public:
 	static void DisplayActualLight(CEntity *ent);
+	static void ScanForLightsOnMap(void);
 	static uint8 LightForPeds(void);
 	static bool ShouldCarStopForLight(CVehicle*, bool);
 	static bool ShouldCarStopForBridge(CVehicle*);

diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
@@ -25,6 +25,8 @@
 #include "CdStream.h"
 #include "FileLoader.h"
 
+WRAPPER void CFileLoader::ReloadPaths(const char *filename) { EAXJMP(0x476DB0); }
+
 char CFileLoader::ms_line[256];
 
 const char*

diff --git a/src/core/FileLoader.h b/src/core/FileLoader.h
@@ -39,4 +39,6 @@ class CFileLoader
 	static void LoadPickup(const char *line);
 
 	static void LoadMapZones(const char *filename);
+
+	static void ReloadPaths(const char *filename);
 };
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
@@ -32,4 +32,5 @@ CFire* CFireManager::FindNearestFire(CVector vecPos, float* pDistance)
 }
 
 WRAPPER void CFireManager::StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32) { EAXJMP(0x479590); }
+WRAPPER void CFireManager::Update(void) { EAXJMP(0x479310); }
 WRAPPER CFire *CFireManager::FindFurthestFire_NeverMindFireMen(CVector coors, float, float) { EAXJMP(0x479430); }
diff --git a/src/core/Fire.h b/src/core/Fire.h
@@ -31,6 +31,7 @@ class CFireManager
 	CFire m_aFires[NUM_FIRES];
 public:
 	void StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32);
+	void Update(void);
 	CFire *FindFurthestFire_NeverMindFireMen(CVector coors, float, float);
 	CFire *FindNearestFire(CVector, float*);
 	uint32 GetTotalActiveFires() const { return m_nTotalFires; }