summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-09-12 12:11:13 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-09-12 12:11:13 +0200
commita3aea359b252feb83684b4b19e5fe58a5dc4e2aa (patch)
tree3ebd5b2456abbd7834ed758b7b1edb0bcafac0e1 /src/core
parentmake ATTEMPTS_TO_FIND_NEXT_NODE a define (diff)
downloadre3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar
re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.gz
re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.bz2
re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.lz
re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.xz
re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.zst
re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Collision.cpp2
-rw-r--r--src/core/Collision.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index 66b29d9f..21060500 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -34,6 +34,8 @@ enum Direction
eLevelName &CCollision::ms_collisionInMemory = *(eLevelName*)0x8F6250;
CLinkList<CColModel*> &CCollision::ms_colModelCache = *(CLinkList<CColModel*>*)0x95CB58;
+WRAPPER bool CCollision::IsStoredPoluStillValidVerticalLine(const CVector &pos, float z, CColPoint &point, CStoredCollPoly *poly) { EAXJMP(0x4105A0); }
+
void
CCollision::Init(void)
{
diff --git a/src/core/Collision.h b/src/core/Collision.h
index b2fe6564..7d58c1fc 100644
--- a/src/core/Collision.h
+++ b/src/core/Collision.h
@@ -148,9 +148,8 @@ public:
static bool ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough);
static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly);
static int32 ProcessColModels(const CMatrix &matrixA, CColModel &modelA, const CMatrix &matrixB, CColModel &modelB, CColPoint *spherepoints, CColPoint *linepoints, float *linedists);
-
// TODO:
- // CCollision::IsStoredPolyStillValidVerticalLine
+ static bool IsStoredPoluStillValidVerticalLine(const CVector &pos, float z, CColPoint &point, CStoredCollPoly *poly);
static float DistToLine(const CVector *l0, const CVector *l1, const CVector *point);
static float DistToLine(const CVector *l0, const CVector *l1, const CVector *point, CVector &closest);