summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-08 06:52:03 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-08 06:52:03 +0100
commitf3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba (patch)
tree5f59716adfd44cb5e8e7f03d5503d8d8e01b015d /src/vehicles
parentFix bike's fInAirXRes (diff)
downloadre3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.gz
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.bz2
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.lz
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.xz
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.tar.zst
re3-f3e9c82432a260fa88ed8bc1d4a7432fd4a4fdba.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Bike.cpp3
-rw-r--r--src/vehicles/Cranes.cpp6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
index 3a0be35f..faf31077 100644
--- a/src/vehicles/Bike.cpp
+++ b/src/vehicles/Bike.cpp
@@ -1213,7 +1213,8 @@ CBike::ProcessControl(void)
// Balance bike
if(bBalancedByRider || bIsBeingPickedUp || bIsStanding){
- float onSideness = clamp(DotProduct(GetRight(), m_vecAvgSurfaceNormal), -1.0f, 1.0f);
+ float onSideness = DotProduct(GetRight(), m_vecAvgSurfaceNormal);
+ onSideness = clamp(onSideness, -1.0f, 1.0f);
CVector worldCOM = Multiply3x3(GetMatrix(), m_vecCentreOfMass);
// Keep bike upright
if(bBalancedByRider){
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp
index 2a571a67..8433a0ba 100644
--- a/src/vehicles/Cranes.cpp
+++ b/src/vehicles/Cranes.cpp
@@ -629,11 +629,11 @@ void CCranes::Save(uint8* buf, uint32* size)
for (int i = 0; i < NUM_CRANES; i++) {
CCrane *pCrane = WriteSaveBuf(buf, aCranes[i]);
if (pCrane->m_pCraneEntity != nil)
- pCrane->m_pCraneEntity = (CBuilding*)(CPools::GetBuildingPool()->GetJustIndex(pCrane->m_pCraneEntity) + 1);
+ pCrane->m_pCraneEntity = (CBuilding*)(CPools::GetBuildingPool()->GetJustIndex_NoFreeAssert(pCrane->m_pCraneEntity) + 1);
if (pCrane->m_pHook != nil)
- pCrane->m_pHook = (CObject*)(CPools::GetObjectPool()->GetJustIndex(pCrane->m_pHook) + 1);
+ pCrane->m_pHook = (CObject*)(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert(pCrane->m_pHook) + 1);
if (pCrane->m_pVehiclePickedUp != nil)
- pCrane->m_pVehiclePickedUp = (CVehicle*)(CPools::GetVehiclePool()->GetJustIndex(pCrane->m_pVehiclePickedUp) + 1);
+ pCrane->m_pVehiclePickedUp = (CVehicle*)(CPools::GetVehiclePool()->GetJustIndex_NoFreeAssert(pCrane->m_pVehiclePickedUp) + 1);
}
VALIDATESAVEBUF(*size);