diff options
| author | saml1er <danishroar@gmail.com> | 2020-04-17 00:01:53 +0500 |
|---|---|---|
| committer | saml1er <danishroar@gmail.com> | 2020-04-17 00:01:53 +0500 |
| commit | e52a02fb9e1dd5602e80d88691f2ee2291d1fa52 (patch) | |
| tree | 333caa1599e2f0c6b91bdae2092cf085eaf8238a /src/core/World.h | |
| parent | Reverse CWorld (diff) | |
| parent | More refs removed (diff) | |
| download | re3-e52a02fb9e1dd5602e80d88691f2ee2291d1fa52.tar.gz | |
Merge branch 'master' into world
# Conflicts:
# src/core/World.cpp
# src/core/World.h
Diffstat (limited to 'src/core/World.h')
| -rw-r--r-- | src/core/World.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/World.h b/src/core/World.h index bcb9ca27..fcf7b7cb 100644 --- a/src/core/World.h +++ b/src/core/World.h @@ -61,7 +61,7 @@ class CWorld public: static uint8 &PlayerInFocus; - static CPlayerInfo (&Players)[NUMPLAYERS]; + static CPlayerInfo Players[NUMPLAYERS]; static CEntity *&pIgnoreEntity; static bool &bIncludeDeadPeds; static bool &bNoMoreCollisionTorque; @@ -151,9 +151,10 @@ public: static void Process(); static void TriggerExplosion(const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer); static void TriggerExplosionSectorList(CPtrList& list, const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer); + static void UseDetonator(CEntity *); }; -extern CColPoint *gaTempSphereColPoints; +extern CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS]; class CPlayerPed; class CVehicle; |