summaryrefslogtreecommitdiffstats
path: root/src/core/World.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-14 23:15:56 +0200
committeraap <aap@papnet.eu>2020-06-14 23:15:56 +0200
commit0741fd5b1d9bd0249f40daa85e679b6e9180602c (patch)
tree9b4e7b2eee5ce06de1983c7c88ddeb5230f8eb80 /src/core/World.h
parentMerge pull request #631 from erorcun/miami (diff)
downloadre3-0741fd5b1d9bd0249f40daa85e679b6e9180602c.tar
re3-0741fd5b1d9bd0249f40daa85e679b6e9180602c.tar.gz
re3-0741fd5b1d9bd0249f40daa85e679b6e9180602c.tar.bz2
re3-0741fd5b1d9bd0249f40daa85e679b6e9180602c.tar.lz
re3-0741fd5b1d9bd0249f40daa85e679b6e9180602c.tar.xz
re3-0741fd5b1d9bd0249f40daa85e679b6e9180602c.tar.zst
re3-0741fd5b1d9bd0249f40daa85e679b6e9180602c.zip
Diffstat (limited to 'src/core/World.h')
-rw-r--r--src/core/World.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/World.h b/src/core/World.h
index 3da774ba..8d539061 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -103,8 +103,8 @@ public:
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&, Const CVector&, float, bool, short*, short, CEntity**);
- static void FindObjectsInRange(Const CVector&, float, bool, short*, short, CEntity**, bool, bool, bool, bool, bool);
+ static void FindObjectsInRangeSectorList(CPtrList &list, Const CVector &centre, float radius, bool ignoreZ, int16 *numObjects, int16 lastObject, CEntity **objects);
+ static void FindObjectsInRange(Const CVector &centre, float radius, bool ignoreZ, int16 *numObjects, int16 lastObject, CEntity **objects, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies);
static void FindObjectsOfTypeInRangeSectorList(uint32 modelId, CPtrList& list, const CVector& position, float radius, bool bCheck2DOnly, int16* nEntitiesFound, int16 maxEntitiesToFind, CEntity** aEntities);
static void FindObjectsOfTypeInRange(uint32 modelId, const CVector& position, float radius, bool bCheck2DOnly, int16* nEntitiesFound, int16 maxEntitiesToFind, CEntity** aEntities, bool bBuildings, bool bVehicles, bool bPeds, bool bObjects, bool bDummies);
static float FindGroundZForCoord(float x, float y);