summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-03-28 13:24:13 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-03-28 13:24:13 +0100
commit268f92bfbe5330149be341855fa52f53ea501c62 (patch)
treee4ec5d4cc96e2bdc1fd153fc605d20e1a410f592 /src/core
parentMerge pull request #353 from Sergeanur/Debug (diff)
downloadre3-268f92bfbe5330149be341855fa52f53ea501c62.tar
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.gz
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.bz2
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.lz
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.xz
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.zst
re3-268f92bfbe5330149be341855fa52f53ea501c62.zip
Diffstat (limited to '')
-rw-r--r--src/core/Pad.h7
-rw-r--r--src/core/Stats.cpp1
-rw-r--r--src/core/Stats.h1
-rw-r--r--src/core/World.cpp1
-rw-r--r--src/core/World.h1
-rw-r--r--src/core/config.h2
6 files changed, 11 insertions, 2 deletions
diff --git a/src/core/Pad.h b/src/core/Pad.h
index 09691128..a231900e 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -4,7 +4,7 @@ enum {
PLAYERCONTROL_ENABLED = 0,
PLAYERCONTROL_DISABLED_1 = 1,
PLAYERCONTROL_DISABLED_2 = 2,
- PLAYERCONTROL_DISABLED_4 = 4,
+ PLAYERCONTROL_GARAGE = 4,
PLAYERCONTROL_DISABLED_8 = 8,
PLAYERCONTROL_DISABLED_10 = 16,
PLAYERCONTROL_DISABLED_20 = 32, // used on CPlayerInfo::MakePlayerSafe
@@ -423,7 +423,10 @@ public:
bool GetRightShoulder1(void) { return !!NewState.RightShoulder1; }
bool GetRightShoulder2(void) { return !!NewState.RightShoulder2; }
- bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
+ bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
+ void SetDisablePlayerControls(uint8 who) { DisablePlayerControls |= who; }
+ void SetEnablePlayerControls(uint8 who) { DisablePlayerControls &= ~who; }
+ bool IsPlayerControlsDisabledBy(uint8 who) { return DisablePlayerControls & who; }
};
VALIDATE_SIZE(CPad, 0xFC);
diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp
index 93eeb759..2a3f06b3 100644
--- a/src/core/Stats.cpp
+++ b/src/core/Stats.cpp
@@ -48,6 +48,7 @@ int32& CStats::LongestFlightInDodo = *(int32*)0x8F5FE4;
int32& CStats::TimeTakenDefuseMission = *(int32*)0x880E24;
int32& CStats::TotalNumberKillFrenzies = *(int32*)0x8E2884;
int32& CStats::TotalNumberMissions = *(int32*)0x8E2820;
+int32& CStats::KgOfExplosivesUsed = *(int32*)0x8F2510;
int32(&CStats::FastestTimes)[CStats::TOTAL_FASTEST_TIMES] = *(int32(*)[CStats::TOTAL_FASTEST_TIMES])*(uintptr*)0x6E9128;
int32(&CStats::HighestScores)[CStats::TOTAL_HIGHEST_SCORES] = *(int32(*)[CStats::TOTAL_HIGHEST_SCORES]) * (uintptr*)0x8622B0;
diff --git a/src/core/Stats.h b/src/core/Stats.h
index 0a750d5e..f6ff8187 100644
--- a/src/core/Stats.h
+++ b/src/core/Stats.h
@@ -53,6 +53,7 @@ public:
static int32 &TotalNumberMissions;
static int32(&FastestTimes)[TOTAL_FASTEST_TIMES];
static int32(&HighestScores)[TOTAL_HIGHEST_SCORES];
+ static int32 &KgOfExplosivesUsed;
public:
static void RegisterFastestTime(int32, int32);
diff --git a/src/core/World.cpp b/src/core/World.cpp
index cbceb292..1832ce72 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -52,6 +52,7 @@ WRAPPER void CWorld::FindObjectsOfTypeInRangeSectorList(uint32, CPtrList&, CVect
WRAPPER void CWorld::FindMissionEntitiesIntersectingCube(const CVector&, const CVector&, int16*, int16, CEntity**, bool, bool, bool) { EAXJMP(0x4B3680); }
WRAPPER void CWorld::ClearCarsFromArea(float, float, float, float, float, float) { EAXJMP(0x4B50E0); }
WRAPPER void CWorld::ClearPedsFromArea(float, float, float, float, float, float) { EAXJMP(0x4B52B0); }
+WRAPPER void CWorld::CallOffChaseForArea(float, float, float, float) { EAXJMP(0x4B5530); }
void
CWorld::Initialise()
diff --git a/src/core/World.h b/src/core/World.h
index 1ad65ac4..75d17a71 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -117,6 +117,7 @@ public:
static void FindMissionEntitiesIntersectingCube(const CVector&, const CVector&, int16*, int16, CEntity**, bool, bool, bool);
static void ClearCarsFromArea(float, float, float, float, float, float);
static void ClearPedsFromArea(float, float, float, float, float, float);
+ static void CallOffChaseForArea(float, float, float, float);
static float GetSectorX(float f) { return ((f - WORLD_MIN_X)/SECTOR_SIZE_X); }
static float GetSectorY(float f) { return ((f - WORLD_MIN_Y)/SECTOR_SIZE_Y); }
diff --git a/src/core/config.h b/src/core/config.h
index 9235e744..54a4c25f 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -114,6 +114,8 @@ enum Config {
NUM_AUDIO_REFLECTIONS = 5,
NUM_SCRIPT_MAX_ENTITIES = 40,
+
+ NUM_GARAGE_STORED_CARS = 6
};
// We'll use this once we're ready to become independent of the game