mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-14 05:10:34 +00:00
Code Issues Projects Releases Wiki Activity

Setter for bIsStatic (became virtual in SA)

Browse source
This commit is contained in:
Sergeanur 2020-10-18 16:40:06 +03:00
commit b91f6a4550
15 changed files with 62 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/control/RoadBlocks.cpp
View file

@ -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);

10
src/control/Script.cpp
View file

@ -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();
}
}