1 files changed, 38 insertions, 6 deletions

diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
index a65b64d2..d8ad71ea 100644
--- a/src/vehicles/Bike.cpp
+++ b/src/vehicles/Bike.cpp
@@ -37,6 +37,7 @@
 #include "Bike.h"
 #include "Debug.h"
 #include "SaveBuf.h"
+#include "Garages.h"
 
 const uint32 CBike::nSaveStructSize =
 #ifdef COMPATIBLE_SAVES
@@ -74,15 +75,17 @@ CBike::CBike(int32 id, uint8 CreatedBy)
 		break;
 	case MI_PIZZABOY:
 	case MI_FAGGIO:
+	case MI_NOODLEBOY:
 		m_bikeAnimType = ASSOCGRP_BIKE_VESPA;
 		break;
 	case MI_PCJ600:
 		m_bikeAnimType = ASSOCGRP_BIKE_STANDARD;
 		break;
 	case MI_SANCHEZ:
+	case MI_SANCHEZ2:
 		m_bikeAnimType = ASSOCGRP_BIKE_DIRT;
 		break;
-	default: assert(0 && "invalid bike model ID");
+	default: m_bikeAnimType = ASSOCGRP_BIKE_STANDARD; //assert(0 && "invalid bike model ID"); // TODO
 	}
 	m_vehType = VEHICLE_TYPE_BIKE;
 
@@ -110,7 +113,7 @@ CBike::CBike(int32 id, uint8 CreatedBy)
 	m_fTurnMass = pHandling->fTurnMass;
 	m_vecCentreOfMass = pHandling->CentreOfMass;
 	m_vecCentreOfMass.z = 0.1f;
-	m_fAirResistance = pHandling->Dimension.x*pHandling->Dimension.z/m_fMass;
+	m_fAirResistance = pHandling->fDragMult > 0.01f ? pHandling->fDragMult*0.0005f : pHandling->fDragMult;
 	m_fElasticity = 0.05f;
 	m_fBuoyancy = pHandling->fBuoyancy;
 
@@ -134,6 +137,8 @@ CBike::CBike(int32 id, uint8 CreatedBy)
 	bIsOnFire = false;
 	bWheelieCam = false;
 
+	bFixedColour = false; // <- figure out actual place (TODO)
+
 	m_fTireTemperature = 1.0f;
 	m_fBrakeDestabilization = 0.0f;
 	m_fVelocityChangeForAudio = 0;
@@ -228,7 +233,19 @@ CBike::ProcessControl(void)
 
 	ProcessCarAlarm();
 
-	ActivateBombWhenEntered();
+	if (pDriver) {
+		if (!bDriverLastFrame && m_bombType == CARBOMB_ONIGNITIONACTIVE) {
+			// If someone enters the car and there is a bomb, detonate
+			m_nBombTimer = 1000;
+			m_pBlowUpEntity = m_pBombRigger;
+			if (m_pBlowUpEntity)
+				m_pBlowUpEntity->RegisterReference((CEntity**)&m_pBlowUpEntity);
+			DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_TICK, 1.0f);
+		}
+		bDriverLastFrame = true;
+	}
+	else
+		bDriverLastFrame = false;
 
 	CRubbish::StirUp(this);
 
@@ -296,8 +313,23 @@ CBike::ProcessControl(void)
 				ApplyMoveForce(parallelSpeed * -CTimer::GetTimeStep()*SAND_SLOWDOWN*m_fMass);
 			}
 		}
-		if(CPad::GetPad(0)->WeaponJustDown())
-			ActivateBomb();
+
+#ifdef BOMBS_ON_BIKES
+		if(CPad::GetPad(0)->WeaponJustDown()) {
+			if (m_bombType == CARBOMB_TIMED) {
+				m_bombType = CARBOMB_TIMEDACTIVE;
+				m_nBombTimer = 7000;
+				m_pBlowUpEntity = FindPlayerPed();
+				CGarages::TriggerMessage("GA_12", -1, 3000, -1);
+				DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_TIMED_ACTIVATED, 1.0f);
+			}
+			else if (m_bombType == CARBOMB_ONIGNITION) {
+				m_bombType = CARBOMB_ONIGNITIONACTIVE;
+				CGarages::TriggerMessage("GA_12", -1, 3000, -1);
+				DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_ONIGNITION_ACTIVATED, 1.0f);
+			}
+		}
+#endif
 		break;
 
 	case STATUS_PLAYER_PLAYBACKFROMBUFFER:
@@ -1723,7 +1755,7 @@ CBike::PreRender(void)
 						   TheCamera.GetLookDirection() == LOOKING_RIGHT)
 							pos1 -= 0.2f*GetForward();
 
-						CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
+						//CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
 					}
 				}
 			}