diff options
| author | aap <aap@papnet.eu> | 2019-09-14 20:20:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-14 20:20:18 +0200 |
| commit | e535f684ed06113f5dd08d615ae19e92d054f3ac (patch) | |
| tree | e82c3293769fd12d24b07493d5a8d98794194e13 /src/core | |
| parent | Merge pull request #206 from erorcun/erorcun (diff) | |
| parent | fix debug (diff) | |
| download | re3-e535f684ed06113f5dd08d615ae19e92d054f3ac.tar re3-e535f684ed06113f5dd08d615ae19e92d054f3ac.tar.gz re3-e535f684ed06113f5dd08d615ae19e92d054f3ac.tar.bz2 re3-e535f684ed06113f5dd08d615ae19e92d054f3ac.tar.lz re3-e535f684ed06113f5dd08d615ae19e92d054f3ac.tar.xz re3-e535f684ed06113f5dd08d615ae19e92d054f3ac.tar.zst re3-e535f684ed06113f5dd08d615ae19e92d054f3ac.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Collision.cpp | 2 | ||||
| -rw-r--r-- | src/core/Collision.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp index 66b29d9f..fc8428be 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::IsStoredPolyStillValidVerticalLine(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..9597a181 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 IsStoredPolyStillValidVerticalLine(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); |