summaryrefslogtreecommitdiffstats
path: root/src/control/Garages.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-08-19 22:34:33 +0200
committerSergeanur <s.anureev@yandex.ua>2020-08-19 22:34:33 +0200
commit827b240078132bc893963212871e2d7b6294c6a3 (patch)
tree4e2c129c0a61c3086cb911576030e43fa317332e /src/control/Garages.cpp
parent2 new opcodes (diff)
parentlittle fix (diff)
downloadre3-827b240078132bc893963212871e2d7b6294c6a3.tar
re3-827b240078132bc893963212871e2d7b6294c6a3.tar.gz
re3-827b240078132bc893963212871e2d7b6294c6a3.tar.bz2
re3-827b240078132bc893963212871e2d7b6294c6a3.tar.lz
re3-827b240078132bc893963212871e2d7b6294c6a3.tar.xz
re3-827b240078132bc893963212871e2d7b6294c6a3.tar.zst
re3-827b240078132bc893963212871e2d7b6294c6a3.zip
Diffstat (limited to 'src/control/Garages.cpp')
-rw-r--r--src/control/Garages.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index e7b5ebe6..9aba431c 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -1324,7 +1324,7 @@ void CGarage::RemoveCarsBlockingDoorNotInside()
if (!IsEntityTouching3D(pVehicle))
continue;
if (!IsPointInsideGarage(pVehicle->GetPosition())) {
- if (pVehicle->bIsLocked && pVehicle->CanBeDeleted()) {
+ if (!pVehicle->bIsLocked && pVehicle->CanBeDeleted()) {
CWorld::Remove(pVehicle);
delete pVehicle;
return; // WHY?
@@ -1817,8 +1817,9 @@ CVehicle* CStoredCar::RestoreCar()
pVehicle->m_nRadioStation = m_nRadioStation;
pVehicle->bFreebies = false;
#ifdef FIX_BUGS
- ((CAutomobile*)pVehicle)->m_bombType = m_nCarBombType;
+ if (pVehicle->IsCar())
#endif
+ ((CAutomobile*)pVehicle)->m_bombType = m_nCarBombType;
pVehicle->bHasBeenOwnedByPlayer = true;
pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
pVehicle->bBulletProof = m_bBulletproof;