diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-14 19:58:09 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-14 19:58:09 +0200 |
| commit | fbe09534d9f1f745b9118ae783b0c1917a41e6d8 (patch) | |
| tree | 27d6b484ef1377f691d6b7ce591dec85f488629d | |
| parent | Merge branch 'carctrl_dev' (diff) | |
| download | re3-fbe09534d9f1f745b9118ae783b0c1917a41e6d8.tar re3-fbe09534d9f1f745b9118ae783b0c1917a41e6d8.tar.gz re3-fbe09534d9f1f745b9118ae783b0c1917a41e6d8.tar.bz2 re3-fbe09534d9f1f745b9118ae783b0c1917a41e6d8.tar.lz re3-fbe09534d9f1f745b9118ae783b0c1917a41e6d8.tar.xz re3-fbe09534d9f1f745b9118ae783b0c1917a41e6d8.tar.zst re3-fbe09534d9f1f745b9118ae783b0c1917a41e6d8.zip | |
| -rw-r--r-- | src/control/CarCtrl.cpp | 4 | ||||
| -rw-r--r-- | src/core/Collision.cpp | 2 | ||||
| -rw-r--r-- | src/core/Collision.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index a543708e..6f695d00 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -1964,7 +1964,7 @@ void CCarCtrl::DragCarToPoint(CVehicle* pVehicle, CVector* pPoint) float actualBehindZ; CColPoint point; CEntity* pRoadObject; - if (CCollision::IsStoredPoluStillValidVerticalLine(CVector(posTarget.x, posTarget.y, pVehicle->GetPosition().z - 3.0f), + if (CCollision::IsStoredPolyStillValidVerticalLine(CVector(posTarget.x, posTarget.y, pVehicle->GetPosition().z - 3.0f), pVehicle->GetPosition().z - 3.0f, point, &pVehicle->m_aCollPolys[0])){ actualAheadZ = point.point.z; }else if (CWorld::ProcessVerticalLine(CVector(posTarget.x, posTarget.y, pVehicle->GetPosition().z + 1.5f), @@ -1985,7 +1985,7 @@ void CCarCtrl::DragCarToPoint(CVehicle* pVehicle, CVector* pPoint) actualAheadZ = pVehicle->m_fMapObjectHeightAhead; } pVehicle->m_fMapObjectHeightAhead = actualAheadZ; - if (CCollision::IsStoredPoluStillValidVerticalLine(CVector(midPos.x, midPos.y, pVehicle->GetPosition().z - 3.0f), + if (CCollision::IsStoredPolyStillValidVerticalLine(CVector(midPos.x, midPos.y, pVehicle->GetPosition().z - 3.0f), pVehicle->GetPosition().z - 3.0f, point, &pVehicle->m_aCollPolys[1])){ actualBehindZ = point.point.z; }else if (CWorld::ProcessVerticalLine(CVector(midPos.x, midPos.y, pVehicle->GetPosition().z + 1.5f), diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp index 21060500..fc8428be 100644 --- a/src/core/Collision.cpp +++ b/src/core/Collision.cpp @@ -34,7 +34,7 @@ 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); } +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 7d58c1fc..9597a181 100644 --- a/src/core/Collision.h +++ b/src/core/Collision.h @@ -149,7 +149,7 @@ public: 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: - static bool IsStoredPoluStillValidVerticalLine(const CVector &pos, float z, CColPoint &point, CStoredCollPoly *poly); + 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); |