mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-24 02:20:01 +00:00
fix typo
This commit is contained in:
parent
84186e7b0f
commit
fbe09534d9
|
@ -1964,7 +1964,7 @@ void CCarCtrl::DragCarToPoint(CVehicle* pVehicle, CVector* pPoint)
|
||||||
float actualBehindZ;
|
float actualBehindZ;
|
||||||
CColPoint point;
|
CColPoint point;
|
||||||
CEntity* pRoadObject;
|
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])){
|
pVehicle->GetPosition().z - 3.0f, point, &pVehicle->m_aCollPolys[0])){
|
||||||
actualAheadZ = point.point.z;
|
actualAheadZ = point.point.z;
|
||||||
}else if (CWorld::ProcessVerticalLine(CVector(posTarget.x, posTarget.y, pVehicle->GetPosition().z + 1.5f),
|
}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;
|
actualAheadZ = pVehicle->m_fMapObjectHeightAhead;
|
||||||
}
|
}
|
||||||
pVehicle->m_fMapObjectHeightAhead = actualAheadZ;
|
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])){
|
pVehicle->GetPosition().z - 3.0f, point, &pVehicle->m_aCollPolys[1])){
|
||||||
actualBehindZ = point.point.z;
|
actualBehindZ = point.point.z;
|
||||||
}else if (CWorld::ProcessVerticalLine(CVector(midPos.x, midPos.y, pVehicle->GetPosition().z + 1.5f),
|
}else if (CWorld::ProcessVerticalLine(CVector(midPos.x, midPos.y, pVehicle->GetPosition().z + 1.5f),
|
||||||
|
|
|
@ -34,7 +34,7 @@ enum Direction
|
||||||
eLevelName &CCollision::ms_collisionInMemory = *(eLevelName*)0x8F6250;
|
eLevelName &CCollision::ms_collisionInMemory = *(eLevelName*)0x8F6250;
|
||||||
CLinkList<CColModel*> &CCollision::ms_colModelCache = *(CLinkList<CColModel*>*)0x95CB58;
|
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
|
void
|
||||||
CCollision::Init(void)
|
CCollision::Init(void)
|
||||||
|
|
|
@ -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 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);
|
static int32 ProcessColModels(const CMatrix &matrixA, CColModel &modelA, const CMatrix &matrixB, CColModel &modelB, CColPoint *spherepoints, CColPoint *linepoints, float *linedists);
|
||||||
// TODO:
|
// 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);
|
||||||
static float DistToLine(const CVector *l0, const CVector *l1, const CVector *point, CVector &closest);
|
static float DistToLine(const CVector *l0, const CVector *l1, const CVector *point, CVector &closest);
|
||||||
|
|
Loading…
Reference in a new issue