diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-28 15:24:55 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-28 15:24:55 +0300 |
| commit | 9fb101fdd96c82f73f8b09a75a2f248e1ccc0f18 (patch) | |
| tree | 6e220fddfcabc63c477335fb1ddccefe7b6d5e0d /src/core/World.h | |
| parent | 268f92bfbe5330149be341855fa52f53ea501c62 (diff) | |
| parent | 739e80614db70f726c47180173ba19688bec5167 (diff) | |
Merge branch 'master' into garages_dev
Diffstat (limited to 'src/core/World.h')
| -rw-r--r-- | src/core/World.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/World.h b/src/core/World.h index 75d17a71..3fcbc301 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 §or, 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); @@ -142,6 +140,8 @@ public: static void Process(); }; +extern CColPoint *gaTempSphereColPoints; + class CPlayerPed; class CVehicle; CPlayerPed *FindPlayerPed(void); |