summaryrefslogtreecommitdiffstats
path: root/src/core/World.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-03-23 00:34:41 +0100
committerGitHub <noreply@github.com>2020-03-23 00:34:41 +0100
commit4070cad4a746728f0282862aa0a0063c15bbc86e (patch)
treefd780f1f980c6d2036f8b57c32f75e203c7b39a8 /src/core/World.cpp
parentFix order of math operations on integers (fires) (diff)
parentmerge with upstream (diff)
downloadre3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.gz
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.bz2
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.lz
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.xz
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.zst
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.zip
Diffstat (limited to '')
-rw-r--r--src/core/World.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index f6106bb5..cbceb292 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -27,7 +27,7 @@ uint16 &CWorld::ms_nCurrentScanCode = *(uint16*)0x95CC64;
CColPoint &CWorld::ms_testSpherePoint = *(CColPoint*)0x6E64C0;
uint8 &CWorld::PlayerInFocus = *(uint8 *)0x95CD61;
-CPlayerInfo *CWorld::Players = (CPlayerInfo *)0x9412F0;
+CPlayerInfo (&CWorld::Players)[NUMPLAYERS] = *(CPlayerInfo (*)[NUMPLAYERS])*(uintptr*)0x9412F0;
bool &CWorld::bNoMoreCollisionTorque = *(bool*)0x95CDCC;
CEntity *&CWorld::pIgnoreEntity = *(CEntity**)0x8F6494;
bool &CWorld::bIncludeDeadPeds = *(bool*)0x95CD8F;
@@ -38,6 +38,7 @@ bool &CWorld::bProcessCutsceneOnly = *(bool*)0x95CD8B;
bool &CWorld::bDoingCarCollisions = *(bool*)0x95CD8C;
bool &CWorld::bIncludeCarTyres = *(bool*)0x95CDAA;
+WRAPPER void CWorld::AddParticles(void) { EAXJMP(0x4B4010); }
WRAPPER void CWorld::ShutDown(void) { EAXJMP(0x4AE450); }
WRAPPER void CWorld::RepositionCertainDynamicObjects() { EAXJMP(0x4B42B0); }
WRAPPER void CWorld::RemoveStaticObjects() { EAXJMP(0x4B4D50); }