diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-30 12:48:01 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-02 14:13:09 +0200 |
| commit | d23b2c423e5811cf6e9de28cbf8490de32ea4fb5 (patch) | |
| tree | 0240b530a05679dc6d629c414f59bf56588a93b2 /src/core | |
| parent | Merge pull request #502 from rollschuh2282/patch-1 (diff) | |
| download | re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.gz re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.bz2 re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.lz re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.xz re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.zst re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Placeable.h | 6 | ||||
| -rw-r--r-- | src/core/World.cpp | 4 | ||||
| -rw-r--r-- | src/core/World.h | 4 | ||||
| -rw-r--r-- | src/core/common.h | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/src/core/Placeable.h b/src/core/Placeable.h index 2df26a7c..d39bb0d9 100644 --- a/src/core/Placeable.h +++ b/src/core/Placeable.h @@ -11,6 +11,12 @@ public: CPlaceable(void); virtual ~CPlaceable(void); CVector &GetPosition(void) { return m_matrix.GetPosition(); } + void SetPosition(float x, float y, float z) { + m_matrix.GetPosition().x = x; + m_matrix.GetPosition().y = y; + m_matrix.GetPosition().z = z; + } + void SetPosition(const CVector &pos) { m_matrix.GetPosition() = pos; } CVector &GetRight(void) { return m_matrix.GetRight(); } CVector &GetForward(void) { return m_matrix.GetForward(); } CVector &GetUp(void) { return m_matrix.GetUp(); } diff --git a/src/core/World.cpp b/src/core/World.cpp index 4b2ca76e..30d086df 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -659,7 +659,7 @@ CWorld::GetIsLineOfSightSectorListClear(CPtrList &list, const CColLine &line, bo } void -CWorld::FindObjectsInRangeSectorList(CPtrList &list, CVector ¢re, float radius, bool ignoreZ, short *nextObject, +CWorld::FindObjectsInRangeSectorList(CPtrList &list, Const CVector ¢re, float radius, bool ignoreZ, short *nextObject, short lastObject, CEntity **objects) { float radiusSqr = radius * radius; @@ -685,7 +685,7 @@ CWorld::FindObjectsInRangeSectorList(CPtrList &list, CVector ¢re, float radi } void -CWorld::FindObjectsInRange(CVector ¢re, float radius, bool ignoreZ, short *nextObject, short lastObject, +CWorld::FindObjectsInRange(Const CVector ¢re, float radius, bool ignoreZ, short *nextObject, short lastObject, CEntity **objects, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies) { diff --git a/src/core/World.h b/src/core/World.h index 25c76531..991180af 100644 --- a/src/core/World.h +++ b/src/core/World.h @@ -101,8 +101,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&, CVector&, float, bool, short*, short, CEntity**); - static void FindObjectsInRange(CVector&, float, bool, short*, short, CEntity**, bool, bool, bool, bool, 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 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); diff --git a/src/core/common.h b/src/core/common.h index 18f4715c..ff8580a1 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -58,6 +58,9 @@ #define Max(a,b) ((a) > (b) ? (a) : (b)) #define Min(a,b) ((a) < (b) ? (a) : (b)) +// Use this to add const that wasn't there in the original code +#define Const const + typedef uint8_t uint8; typedef int8_t int8; typedef uint16_t uint16; |