diff options
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 6 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 12c9c940..ab213beb 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -55,7 +55,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy) { int i; - m_vehType = VEHICLE_TYPE_CAR; + m_vehType = VEHICLE_TYPE_AUTOMOBILE; CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id); m_fFireBlowUpTimer = 0.0f; @@ -2350,7 +2350,7 @@ CAutomobile::FireTruckControl(void) Sin(m_fCarGunUD)); cannonDir = Multiply3x3(GetMatrix(), cannonDir); cannonDir.z += (CGeneral::GetRandomNumber()&0xF)/1000.0f; - CWaterCannons::UpdateOne((uintptr)this, &cannonPos, &cannonDir); + CWaterCannon::UpdateOne((uintptr)this, &cannonPos, &cannonDir); }else if(m_status == STATUS_PHYSICS){ CFire *fire = gFireManager.FindFurthestFire_NeverMindFireMen(GetPosition(), 10.0f, 35.0f); if(fire == nil) @@ -2385,7 +2385,7 @@ CAutomobile::FireTruckControl(void) Sin(m_fCarGunUD)); cannonDir = Multiply3x3(GetMatrix(), cannonDir); cannonDir.z += (CGeneral::GetRandomNumber()&0xF)/1000.0f; - CWaterCannons::UpdateOne((uintptr)this, &cannonPos, &cannonDir); + CWaterCannon::UpdateOne((uintptr)this, &cannonPos, &cannonDir); } } } diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index a30f9842..5c5b328e 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -191,7 +191,7 @@ public: uint8 m_bRainAudioCounter; uint8 m_bRainSamplesCounter; uint8 m_nCarHornTimer; - int8 field_22D; + int8 field_22D; // last horn? bool m_bSirenOrAlarm; int8 m_comedyControlState; CStoredCollPoly m_aCollPolys[2]; // poly which is under front/rear part of car @@ -230,7 +230,7 @@ public: virtual float GetHeightAboveRoad(void); virtual void PlayCarHorn(void) {} - bool IsCar(void) { return m_vehType == VEHICLE_TYPE_CAR; } + bool IsCar(void) { return m_vehType == VEHICLE_TYPE_AUTOMOBILE; } bool IsBoat(void) { return m_vehType == VEHICLE_TYPE_BOAT; } bool IsTrain(void) { return m_vehType == VEHICLE_TYPE_TRAIN; } bool IsHeli(void) { return m_vehType == VEHICLE_TYPE_HELI; } @@ -286,7 +286,7 @@ class cTransmission; class cVehicleParams { public: - char m_bDistanceCalculated; + uint8 m_bDistancECalculated; char gap_1[3]; float m_fDistance; CVehicle *m_pVehicle; |