summaryrefslogtreecommitdiffstats
path: root/src/core/World.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-01-03 17:48:13 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-01-03 17:48:13 +0100
commit0723dade768ad6118db00c7bb908f39949fb7970 (patch)
treea477b1f04fe92af9619cb8495518691aa409abba /src/core/World.h
parentbug fixes (diff)
downloadre3-0723dade768ad6118db00c7bb908f39949fb7970.tar
re3-0723dade768ad6118db00c7bb908f39949fb7970.tar.gz
re3-0723dade768ad6118db00c7bb908f39949fb7970.tar.bz2
re3-0723dade768ad6118db00c7bb908f39949fb7970.tar.lz
re3-0723dade768ad6118db00c7bb908f39949fb7970.tar.xz
re3-0723dade768ad6118db00c7bb908f39949fb7970.tar.zst
re3-0723dade768ad6118db00c7bb908f39949fb7970.zip
Diffstat (limited to 'src/core/World.h')
-rw-r--r--src/core/World.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/World.h b/src/core/World.h
index 119c6324..61a44ea0 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -22,6 +22,8 @@
#define WORLD_MAX_X (WORLD_MIN_X + WORLD_SIZE_X)
#define WORLD_MAX_Y (WORLD_MIN_Y + WORLD_SIZE_Y)
+#define MAP_Z_LOW_LIMIT -100.0f
+
enum
{
ENTITYLIST_BUILDINGS,
@@ -103,11 +105,15 @@ public:
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);
+ static void FindObjectsOfTypeInRangeSectorList(uint32, CPtrList&, CVector&, float, bool, short*, short, CEntity**);
+ static void FindObjectsOfTypeInRange(uint32, CVector&, float, bool, short*, short, CEntity**, bool, bool, bool, bool, bool);
static float FindGroundZForCoord(float x, float y);
static float FindGroundZFor3DCoord(float x, float y, float z, bool *found);
static float FindRoofZFor3DCoord(float x, float y, float z, bool *found);
static void RemoveReferencesToDeletedObject(CEntity*);
static void FindObjectsKindaColliding(const CVector &, float, bool, int16*, int16, CEntity **, bool, bool, bool, bool, bool);
+ static void FindObjectsIntersectingCube(const CVector &, const CVector &, int16*, int16, CEntity **, bool, bool, bool, bool, bool);
+ static void FindObjectsIntersectingAngledCollisionBox(const CColBox &, const CMatrix &, const CVector &, float, float, float, float, int16*, int16, CEntity **, bool, bool, bool, bool, bool);
static float GetSectorX(float f) { return ((f - WORLD_MIN_X)/SECTOR_SIZE_X); }
static float GetSectorY(float f) { return ((f - WORLD_MIN_Y)/SECTOR_SIZE_Y); }