diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-29 18:32:22 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-29 18:32:22 +0200 |
| commit | 453f8c05a4fc2ef03ba1d4f7bac43ba871c52fbd (patch) | |
| tree | b1586ab27437633e49c795c2e1277f6ca4877cfa /src/control/Script8.cpp | |
| parent | fix (diff) | |
| download | re3-453f8c05a4fc2ef03ba1d4f7bac43ba871c52fbd.tar re3-453f8c05a4fc2ef03ba1d4f7bac43ba871c52fbd.tar.gz re3-453f8c05a4fc2ef03ba1d4f7bac43ba871c52fbd.tar.bz2 re3-453f8c05a4fc2ef03ba1d4f7bac43ba871c52fbd.tar.lz re3-453f8c05a4fc2ef03ba1d4f7bac43ba871c52fbd.tar.xz re3-453f8c05a4fc2ef03ba1d4f7bac43ba871c52fbd.tar.zst re3-453f8c05a4fc2ef03ba1d4f7bac43ba871c52fbd.zip | |
Diffstat (limited to 'src/control/Script8.cpp')
| -rw-r--r-- | src/control/Script8.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/control/Script8.cpp b/src/control/Script8.cpp index 38c28069..c4f80e79 100644 --- a/src/control/Script8.cpp +++ b/src/control/Script8.cpp @@ -3,6 +3,7 @@ #include "Script.h" #include "ScriptCommands.h" +#include "Bike.h" #include "DMAudio.h" #ifdef MORE_LANGUAGES #include "Frontend.h" @@ -378,10 +379,25 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command) { CollectParameters(&m_nIp, 1); CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(0)); - if (pVehicle->m_bombType != CARBOMB_NONE) { - pVehicle->m_bombType = CARBOMB_NONE; - pVehicle->m_pBombRigger = nil; +#ifdef FIX_BUGS + if (pVehicle->IsCar()) { + if (((CAutomobile*)pVehicle)->m_bombType != CARBOMB_NONE) { + ((CAutomobile*)pVehicle)->m_bombType = CARBOMB_NONE; + ((CAutomobile*)pVehicle)->m_pBombRigger = nil; + } + } + else if (pVehicle->IsBike()) { + if (((CBike*)pVehicle)->m_bombType != CARBOMB_NONE) { + ((CBike*)pVehicle)->m_bombType = CARBOMB_NONE; + ((CBike*)pVehicle)->m_pBombRigger = nil; + } + } +#else + if (((CAutomobile*)pVehicle)->m_bombType != CARBOMB_NONE) { + ((CAutomobile*)pVehicle)->m_bombType = CARBOMB_NONE; + ((CAutomobile*)pVehicle)->m_pBombRigger = nil; } +#endif return 0; } case COMMAND_IS_JAPANESE_GAME: |