summaryrefslogtreecommitdiffstats
path: root/src/core/World.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-30 12:53:51 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-30 12:53:51 +0100
commitdbf5c06144d6ccc74fce696ea20571939be3ad4a (patch)
treeab8881ae3a818116a8efe4c4c6674e24d113ec12 /src/core/World.cpp
parentwaterlevel: use macro for 400.0f (diff)
downloadre3-dbf5c06144d6ccc74fce696ea20571939be3ad4a.tar
re3-dbf5c06144d6ccc74fce696ea20571939be3ad4a.tar.gz
re3-dbf5c06144d6ccc74fce696ea20571939be3ad4a.tar.bz2
re3-dbf5c06144d6ccc74fce696ea20571939be3ad4a.tar.lz
re3-dbf5c06144d6ccc74fce696ea20571939be3ad4a.tar.xz
re3-dbf5c06144d6ccc74fce696ea20571939be3ad4a.tar.zst
re3-dbf5c06144d6ccc74fce696ea20571939be3ad4a.zip
Diffstat (limited to 'src/core/World.cpp')
-rw-r--r--src/core/World.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index ef1cc948..40c060c0 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -2239,8 +2239,12 @@ CWorld::UseDetonator(CEntity *pEntity)
{
int32 i = CPools::GetVehiclePool()->GetSize();
while(--i >= 0) {
+#ifdef FIX_BUGS
+ CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
+#else
CAutomobile *pVehicle = (CAutomobile *)CPools::GetVehiclePool()->GetSlot(i);
- if(pVehicle && !pVehicle->m_vehType && pVehicle->m_bombType == CARBOMB_REMOTE &&
+#endif
+ if(pVehicle && pVehicle->m_bombType == CARBOMB_REMOTE &&
pVehicle->m_pBombRigger == pEntity) {
pVehicle->m_bombType = CARBOMB_NONE;
pVehicle->m_nBombTimer = 500;