diff options
| author | aap <aap@papnet.eu> | 2019-07-24 23:06:58 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-07-24 23:06:58 +0200 |
| commit | ecf03d0f54850005efdcea682a9728c0613325de (patch) | |
| tree | 1018843e4d41101e759e5c91112d991fd8270049 /src/vehicles/Boat.cpp | |
| parent | fixed buoyancy; implemented CAutomobile::ProcessBuoyancy (diff) | |
| parent | Merge branch 'master' into master (diff) | |
| download | re3-ecf03d0f54850005efdcea682a9728c0613325de.tar re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.gz re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.bz2 re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.lz re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.xz re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.zst re3-ecf03d0f54850005efdcea682a9728c0613325de.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/vehicles/Boat.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 53a912b3..c18bad25 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -37,8 +37,8 @@ bool CBoat::IsSectorAffectedByWake(CVector2D sector, float fSize, CBoat **apBoat { float fDist = (WAKE_LIFETIME - pBoat->m_afWakePointLifeTime[j]) * fShapeTime + float(j) * fShapeLength + fSize; - if ( fabs(pBoat->m_avec2dWakePoints[j].x - sector.x) < fDist - && fabs(pBoat->m_avec2dWakePoints[i].y - sector.y) < fDist ) + if ( Abs(pBoat->m_avec2dWakePoints[j].x - sector.x) < fDist + && Abs(pBoat->m_avec2dWakePoints[i].y - sector.y) < fDist ) { apBoats[numVerts] = pBoat; numVerts = 1; // += ? @@ -56,13 +56,12 @@ float CBoat::IsVertexAffectedByWake(CVector vecVertex, CBoat *pBoat) { float fMaxDist = (WAKE_LIFETIME - pBoat->m_afWakePointLifeTime[i]) * fShapeTime + float(i) * fShapeLength; - float fX = pBoat->m_avec2dWakePoints[i].x - vecVertex.x; - float fY = pBoat->m_avec2dWakePoints[i].y - vecVertex.y; + CVector2D vecDist = pBoat->m_avec2dWakePoints[i] - CVector2D(vecVertex); - float fDist = fY * fY + fX * fX; + float fDist = vecDist.MagnitudeSqr(); if ( fDist < SQR(fMaxDist) ) - return 1.0f - min(fRangeMult * sqrt(fDist / SQR(fMaxDist)) + (WAKE_LIFETIME - pBoat->m_afWakePointLifeTime[i]) * fTimeMult, 1.0f); + return 1.0f - min(fRangeMult * Sqrt(fDist / SQR(fMaxDist)) + (WAKE_LIFETIME - pBoat->m_afWakePointLifeTime[i]) * fTimeMult, 1.0f); } return 0.0f; |