summaryrefslogtreecommitdiffstats
path: root/src/core/World.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-07-17 15:13:00 +0200
committereray orçunus <erayorcunus@gmail.com>2019-07-17 15:13:00 +0200
commit06ed308bb1a2383125cf04fd712b1753c4ba1d55 (patch)
tree713a8e10b3657d4c3a0d9c20c3704e0da8f9357e /src/core/World.cpp
parentMerge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff)
parentrenamed some variables and added files; more CAutomobile::ProcessControl (diff)
downloadre3-06ed308bb1a2383125cf04fd712b1753c4ba1d55.tar
re3-06ed308bb1a2383125cf04fd712b1753c4ba1d55.tar.gz
re3-06ed308bb1a2383125cf04fd712b1753c4ba1d55.tar.bz2
re3-06ed308bb1a2383125cf04fd712b1753c4ba1d55.tar.lz
re3-06ed308bb1a2383125cf04fd712b1753c4ba1d55.tar.xz
re3-06ed308bb1a2383125cf04fd712b1753c4ba1d55.tar.zst
re3-06ed308bb1a2383125cf04fd712b1753c4ba1d55.zip
Diffstat (limited to 'src/core/World.cpp')
-rw-r--r--src/core/World.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index a9ec1f2a..829a64d4 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -28,6 +28,8 @@ bool &CWorld::bSecondShift = *(bool*)0x95CD54;
bool &CWorld::bForceProcessControl = *(bool*)0x95CD6C;
bool &CWorld::bProcessCutsceneOnly = *(bool*)0x95CD8B;
+WRAPPER void CWorld::RemoveReferencesToDeletedObject(CEntity*) { EAXJMP(0x4B3BF0); }
+
void
CWorld::Add(CEntity *ent)
{
@@ -605,12 +607,12 @@ CWorld::FindObjectsInRange(CVector &centre, float distance, bool ignoreZ, short
minY = 0;
int maxX = GetSectorIndexX(centre.x + distance);
- if (maxX >= 100)
- maxX = 100;
+ if (maxX >= NUMSECTORS_X)
+ maxX = NUMSECTORS_X;
int maxY = GetSectorIndexY(centre.y + distance);
- if (maxY >= 100)
- maxY = 100;
+ if (maxY >= NUMSECTORS_Y)
+ maxY = NUMSECTORS_Y;
AdvanceCurrentScanCode();
@@ -656,12 +658,12 @@ CWorld::TestSphereAgainstWorld(CVector centre, float distance, CEntity* entityTo
minY = 0;
int maxX = GetSectorIndexX(centre.x + distance);
- if (maxX >= 100)
- maxX = 100;
+ if (maxX >= NUMSECTORS_X)
+ maxX = NUMSECTORS_X;
int maxY = GetSectorIndexY(centre.y + distance);
- if (maxY >= 100)
- maxY = 100;
+ if (maxY >= NUMSECTORS_Y)
+ maxY = NUMSECTORS_Y;
AdvanceCurrentScanCode();