summaryrefslogtreecommitdiffstats
path: root/src/core/World.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-03-26 14:16:06 +0100
committeraap <aap@papnet.eu>2020-03-27 10:04:45 +0100
commitf0dfaac838fdbb90783609bf4e45518ccf853708 (patch)
tree0091bdfdf4a7149265af7a596906a9cf4f50a55c /src/core/World.h
parentMerge pull request #353 from Sergeanur/Debug (diff)
downloadre3-f0dfaac838fdbb90783609bf4e45518ccf853708.tar
re3-f0dfaac838fdbb90783609bf4e45518ccf853708.tar.gz
re3-f0dfaac838fdbb90783609bf4e45518ccf853708.tar.bz2
re3-f0dfaac838fdbb90783609bf4e45518ccf853708.tar.lz
re3-f0dfaac838fdbb90783609bf4e45518ccf853708.tar.xz
re3-f0dfaac838fdbb90783609bf4e45518ccf853708.tar.zst
re3-f0dfaac838fdbb90783609bf4e45518ccf853708.zip
Diffstat (limited to 'src/core/World.h')
-rw-r--r--src/core/World.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/World.h b/src/core/World.h
index 1ad65ac4..4b19e629 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -60,8 +60,6 @@ class CWorld
static uint16 &ms_nCurrentScanCode;
public:
- static CColPoint& ms_testSpherePoint;
-
static uint8 &PlayerInFocus;
static CPlayerInfo (&Players)[NUMPLAYERS];
static CEntity *&pIgnoreEntity;
@@ -101,7 +99,7 @@ public:
static bool GetIsLineOfSightSectorClear(CSector &sector, const CColLine &line, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects = false);
static bool GetIsLineOfSightSectorListClear(CPtrList &list, const CColLine &line, bool ignoreSeeThrough, bool ignoreSomeObjects = false);
- static CEntity *TestSphereAgainstWorld(CVector centre, float distance, CEntity *entityToIgnore, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSomeObjects);
+ static CEntity *TestSphereAgainstWorld(CVector centre, float radius, CEntity *entityToIgnore, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSomeObjects);
static CEntity *TestSphereAgainstSectorList(CPtrList&, CVector, float, CEntity*, bool);
static void FindObjectsInRangeSectorList(CPtrList&, CVector&, float, bool, short*, short, CEntity**);
static void FindObjectsInRange(CVector&, float, bool, short*, short, CEntity**, bool, bool, bool, bool, bool);
@@ -141,6 +139,8 @@ public:
static void Process();
};
+extern CColPoint *gaTempSphereColPoints;
+
class CPlayerPed;
class CVehicle;
CPlayerPed *FindPlayerPed(void);