summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authornmzik <nmzik@mail.ru>2019-10-19 00:23:40 +0200
committernmzik <nmzik@mail.ru>2019-10-19 00:23:40 +0200
commitf56684d04e06af21f423ad4bc1c47bc2b09fccea (patch)
tree27e8f9a501a2d909cae3b829d7c85cc91cb5f59f /src/control
parentCPopulation::Initialise() (diff)
downloadre3-f56684d04e06af21f423ad4bc1c47bc2b09fccea.tar
re3-f56684d04e06af21f423ad4bc1c47bc2b09fccea.tar.gz
re3-f56684d04e06af21f423ad4bc1c47bc2b09fccea.tar.bz2
re3-f56684d04e06af21f423ad4bc1c47bc2b09fccea.tar.lz
re3-f56684d04e06af21f423ad4bc1c47bc2b09fccea.tar.xz
re3-f56684d04e06af21f423ad4bc1c47bc2b09fccea.tar.zst
re3-f56684d04e06af21f423ad4bc1c47bc2b09fccea.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/AccidentManager.cpp2
-rw-r--r--src/control/AccidentManager.h1
-rw-r--r--src/control/Cranes.cpp4
-rw-r--r--src/control/Cranes.h2
-rw-r--r--src/control/Garages.cpp5
-rw-r--r--src/control/Garages.h2
-rw-r--r--src/control/Phones.cpp2
-rw-r--r--src/control/Phones.h1
-rw-r--r--src/control/Pickups.cpp1
-rw-r--r--src/control/Pickups.h1
-rw-r--r--src/control/Population.cpp1
-rw-r--r--src/control/Population.h1
-rw-r--r--src/control/Record.cpp3
-rw-r--r--src/control/Record.h3
-rw-r--r--src/control/RoadBlocks.cpp2
-rw-r--r--src/control/RoadBlocks.h2
-rw-r--r--src/control/SceneEdit.cpp5
-rw-r--r--src/control/SceneEdit.h7
-rw-r--r--src/control/TrafficLights.cpp1
-rw-r--r--src/control/TrafficLights.h1
20 files changed, 45 insertions, 2 deletions
diff --git a/src/control/AccidentManager.cpp b/src/control/AccidentManager.cpp
index e2b1f6d0..46d254fc 100644
--- 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
index 999abddc..6d7f25c8 100644
--- 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; \ No newline at end of file
diff --git a/src/control/Cranes.cpp b/src/control/Cranes.cpp
index ebdbf957..291e147f 100644
--- 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); } \ No newline at end of file
+WRAPPER void CCranes::DeActivateCrane(float, float) { EAXJMP(0x543890); }
+WRAPPER void CCranes::InitCranes(void) { EAXJMP(0x543360); }
+WRAPPER void CCranes::UpdateCranes(void) { EAXJMP(0x5439E0); } \ No newline at end of file
diff --git a/src/control/Cranes.h b/src/control/Cranes.h
index be586398..956e2e84 100644
--- a/src/control/Cranes.h
+++ b/src/control/Cranes.h
@@ -10,4 +10,6 @@ public:
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
index 5f55ae66..b5ad37f4 100644
--- 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 \ No newline at end of file
diff --git a/src/control/Garages.h b/src/control/Garages.h
index bcd966e8..41c6b5ad 100644
--- a/src/control/Garages.h
+++ b/src/control/Garages.h
@@ -28,4 +28,6 @@ public:
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
index f8005899..fcab63a2 100644
--- 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
index 6842eef4..99ec520c 100644
--- a/src/control/Phones.h
+++ b/src/control/Phones.h
@@ -56,6 +56,7 @@ public:
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
index e095ec8e..a2440235 100644
--- 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
index cbf3f245..5f9814c3 100644
--- 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
index 39c2b57d..a98721ac 100644
--- a/src/control/Population.cpp
+++ b/src/control/Population.cpp
@@ -31,6 +31,7 @@ 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); }
diff --git a/src/control/Population.h b/src/control/Population.h
index 09218f1b..006e6104 100644
--- a/src/control/Population.h
+++ b/src/control/Population.h
@@ -40,6 +40,7 @@ public:
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);
diff --git a/src/control/Record.cpp b/src/control/Record.cpp
index cff4a19b..802ca516 100644
--- 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); } \ No newline at end of file
diff --git a/src/control/Record.h b/src/control/Record.h
index 08e9f7c8..9f396c96 100644
--- 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
index 3683ff28..ed092391 100644
--- 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); } \ No newline at end of file
diff --git a/src/control/RoadBlocks.h b/src/control/RoadBlocks.h
index 0d965e48..b1bb3589 100644
--- 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
new file mode 100644
index 00000000..287b3c98
--- /dev/null
+++ 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
new file mode 100644
index 00000000..f44b0011
--- /dev/null
+++ 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
index 61c941b8..2cd09a03 100644
--- 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
index f0d0248d..06505ed6 100644
--- 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*);