diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-10-18 15:40:06 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-10-18 15:40:06 +0200 |
commit | b91f6a45501634b55f6ef2c08d57c5293d5fd3a0 (patch) | |
tree | 34cdedbe9dda385d48a416d1c26ef220132d35f0 /src/control | |
parent | Cleanup breaks CAutomobile::ProcessOpenDoor (diff) | |
download | re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.gz re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.bz2 re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.lz re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.xz re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.tar.zst re3-b91f6a45501634b55f6ef2c08d57c5293d5fd3a0.zip |
Diffstat (limited to 'src/control')
-rw-r--r-- | src/control/RoadBlocks.cpp | 2 | ||||
-rw-r--r-- | src/control/Script.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp index 86b4caf1..1496b307 100644 --- a/src/control/RoadBlocks.cpp +++ b/src/control/RoadBlocks.cpp @@ -165,7 +165,7 @@ CRoadBlocks::GenerateRoadBlocks(void) vehicleMatrix.GetPosition().z += fModelRadius - 0.6f; pVehicle->m_matrix = vehicleMatrix; pVehicle->PlaceOnRoadProperly(); - pVehicle->bIsStatic = false; + pVehicle->SetIsStatic(false); pVehicle->m_matrix.UpdateRW(); pVehicle->m_nDoorLock = CARLOCK_UNLOCKED; CCarCtrl::JoinCarWithRoadSystem(pVehicle); diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 5dceacb7..efd17f25 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -3577,7 +3577,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command) if (pos.z <= MAP_Z_LOW_LIMIT) pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y); pos.z += car->GetDistanceFromCentreOfMassToBaseOfModel(); - car->bIsStatic = false; + car->SetIsStatic(false); /* Again weird usage of virtual functions. */ if (car->IsBoat()) { car->Teleport(pos); @@ -9184,14 +9184,14 @@ int8 CRunningScript::ProcessCommands900To999(int32 command) CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]); script_assert(pObject); if (ScriptParams[1]) { - if (pObject->bIsStatic) { - pObject->bIsStatic = false; + if (pObject->GetIsStatic()) { + pObject->SetIsStatic(false); pObject->AddToMovingList(); } } else { - if (!pObject->bIsStatic) { - pObject->bIsStatic = true; + if (!pObject->GetIsStatic()) { + pObject->SetIsStatic(true); pObject->RemoveFromMovingList(); } } |