1 files changed, 16 insertions, 5 deletions

diff --git a/src/control/Script8.cpp b/src/control/Script8.cpp
index 38c28069..3955cacb 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,20 @@ 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;
+		if (pVehicle->IsCar()) {
+			if (((CAutomobile*)pVehicle)->m_bombType != CARBOMB_NONE) {
+				((CAutomobile*)pVehicle)->m_bombType = CARBOMB_NONE;
+				((CAutomobile*)pVehicle)->m_pBombRigger = nil;
+			}
 		}
+#ifdef FIX_BUGS
+		else if (pVehicle->IsBike()) {
+			if (((CBike*)pVehicle)->m_bombType != CARBOMB_NONE) {
+				((CBike*)pVehicle)->m_bombType = CARBOMB_NONE;
+				((CBike*)pVehicle)->m_pBombRigger = nil;
+			}
+		}
+#endif
 		return 0;
 	}
 	case COMMAND_IS_JAPANESE_GAME:
@@ -596,7 +607,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
 	}
 	case COMMAND_SET_RC_HELI_HEIGHT_LIMIT:
 		CollectParameters(&m_nIp, 1);
-		// CVehicle::rcHeliHeightLimit = GET_FLOAT_PARAM(0); // TODO
+		CVehicle::rcHeliHeightLimit = GET_FLOAT_PARAM(0);
 		return 0;
 	case COMMAND_CREATE_SCRIPT_CORONA:
 	{
@@ -700,7 +711,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
 	//case COMMAND_1491:
 	case COMMAND_SET_DEBUG_MENU_ACTIVE:
 		CollectParameters(&m_nIp, 1);
-		// this sets two values on PS2, but not on mobile - TODO?
+		// this sets two values on PS2 and PSP, but not on mobile - TODO?
 		return 0;
 	case COMMAND_SET_DRAW_HUD:
 		CollectParameters(&m_nIp, 1);