summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-07-27 20:28:18 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-07-27 20:28:18 +0200
commit345b8553a7455926d523b90926edb0eacf88a13a (patch)
tree3ba80e1ba6fece816603e9f683f012842347186b /src/core
parentfixed bridge (diff)
downloadre3-345b8553a7455926d523b90926edb0eacf88a13a.tar
re3-345b8553a7455926d523b90926edb0eacf88a13a.tar.gz
re3-345b8553a7455926d523b90926edb0eacf88a13a.tar.bz2
re3-345b8553a7455926d523b90926edb0eacf88a13a.tar.lz
re3-345b8553a7455926d523b90926edb0eacf88a13a.tar.xz
re3-345b8553a7455926d523b90926edb0eacf88a13a.tar.zst
re3-345b8553a7455926d523b90926edb0eacf88a13a.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/User.cpp2
-rw-r--r--src/core/User.h2
-rw-r--r--src/core/World.cpp1
-rw-r--r--src/core/World.h1
-rw-r--r--src/core/config.h2
5 files changed, 8 insertions, 0 deletions
diff --git a/src/core/User.cpp b/src/core/User.cpp
index c9cb97cc..f40a06db 100644
--- a/src/core/User.cpp
+++ b/src/core/User.cpp
@@ -13,6 +13,8 @@ COnscreenTimer& CUserDisplay::OnscnTimer = *(COnscreenTimer*)0x862238;
CPager& CUserDisplay::Pager = *(CPager*)0x8F2744;
CCurrentVehicle& CUserDisplay::CurrentVehicle = *(CCurrentVehicle*)0x8F5FE8;
+WRAPPER void CPager::AddMessage(wchar*, uint16, uint16, uint16) { EAXJMP(0x52B940); }
+
void COnscreenTimer::Init() {
m_bDisabled = false;
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
diff --git a/src/core/User.h b/src/core/User.h
index 8b744c7e..cac2a318 100644
--- a/src/core/User.h
+++ b/src/core/User.h
@@ -52,6 +52,8 @@ class CCurrentVehicle
class CPager
{
+public:
+ void AddMessage(wchar*, uint16, uint16, uint16);
};
class CUserDisplay
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 829a64d4..0440a951 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -29,6 +29,7 @@ bool &CWorld::bForceProcessControl = *(bool*)0x95CD6C;
bool &CWorld::bProcessCutsceneOnly = *(bool*)0x95CD8B;
WRAPPER void CWorld::RemoveReferencesToDeletedObject(CEntity*) { EAXJMP(0x4B3BF0); }
+WRAPPER void CWorld::FindObjectsKindaColliding(const CVector &, float, bool, int16*, int16, CEntity **, bool, bool, bool, bool, bool){ EAXJMP(0x4B2A30); }
void
CWorld::Add(CEntity *ent)
diff --git a/src/core/World.h b/src/core/World.h
index fd9d6fc3..e4f46589 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -103,6 +103,7 @@ public:
static float FindGroundZFor3DCoord(float x, float y, float z, bool *found);
static float FindRoofZFor3DCoord(float x, float y, float z, bool *found);
static void RemoveReferencesToDeletedObject(CEntity*);
+ static void FindObjectsKindaColliding(const CVector &, float, bool, int16*, int16, CEntity **, bool, bool, bool, bool, bool);
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 1bc90496..1f684869 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -64,6 +64,8 @@ enum Config {
NUMRADARBLIPS = 32,
NUMPICKUPS = 336,
NUMEVENTS = 64,
+
+ NUM_CARGENS = 160
};
// We'll use this once we're ready to become independent of the game