diff options
author | aap <aap@papnet.eu> | 2020-05-06 17:56:38 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-05-06 17:56:38 +0200 |
commit | f1c1f56b1268b900a01a479f9ad67cd92e63eb52 (patch) | |
tree | f936f78ebcc7b736995b68b4d65a66c26cc790c2 /src/core/World.h | |
parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
download | re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.gz re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.bz2 re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.lz re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.xz re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.zst re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.zip |
Diffstat (limited to 'src/core/World.h')
-rw-r--r-- | src/core/World.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/World.h b/src/core/World.h index 372cd8b5..19d480ff 100644 --- a/src/core/World.h +++ b/src/core/World.h @@ -113,8 +113,8 @@ public: static void FindObjectsKindaCollidingSectorList(CPtrList& list, const CVector& position, float radius, bool bCheck2DOnly, int16* nCollidingEntities, int16 maxEntitiesToFind, CEntity** aEntities); static void FindObjectsIntersectingCube(const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities, bool bBuildings, bool bVehicles, bool bPeds, bool bObjects, bool bDummies); static void FindObjectsIntersectingCubeSectorList(CPtrList& list, const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities); - static void FindObjectsIntersectingAngledCollisionBox(const CColBox &, const CMatrix &, const CVector &, float, float, float, float, int16*, int16, CEntity **, bool, bool, bool, bool, bool); - static void FindObjectsIntersectingAngledCollisionBoxSectorList(CPtrList& list, const CColBox& boundingBox, const CMatrix& matrix, const CVector& position, int16* nEntitiesFound, int16 maxEntitiesToFind, CEntity** aEntities); + static void FindObjectsIntersectingAngledCollisionBox(const CBox &, const CMatrix &, const CVector &, float, float, float, float, int16*, int16, CEntity **, bool, bool, bool, bool, bool); + static void FindObjectsIntersectingAngledCollisionBoxSectorList(CPtrList& list, const CBox& boundingBox, const CMatrix& matrix, const CVector& position, int16* nEntitiesFound, int16 maxEntitiesToFind, CEntity** aEntities); static void FindMissionEntitiesIntersectingCube(const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities, bool bVehicles, bool bPeds, bool bObjects); static void FindMissionEntitiesIntersectingCubeSectorList(CPtrList& list, const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities, bool bIsVehicleList, bool bIsPedList); |