diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-06-04 05:03:12 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-06-04 05:03:12 +0200 |
| commit | 016ebc0b00905c35ca16dcbd22c41fb4602c3e37 (patch) | |
| tree | 5c08c95450e72b97934c20cf537a4b0d42189e71 /src/vehicles | |
| parent | PedChat & PedDebug (diff) | |
| download | re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.gz re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.bz2 re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.lz re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.xz re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.zst re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Train.cpp | 4 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/vehicles/Train.cpp b/src/vehicles/Train.cpp index 1d47ca3a..21cde17f 100644 --- a/src/vehicles/Train.cpp +++ b/src/vehicles/Train.cpp @@ -197,7 +197,7 @@ CTrain::ProcessControl(void) if(m_bTrainStopping){ m_nDoorTimer = CTimer::GetTimeInMilliseconds() + 1000; m_nDoorState = TRAIN_DOOR_OPENING; - DMAudio.PlayOneShot(m_audioEntityId, SOUND_18, 0.0f); + DMAudio.PlayOneShot(m_audioEntityId, SOUND_TRAIN_DOOR_CLOSE, 0.0f); } break; @@ -214,7 +214,7 @@ CTrain::ProcessControl(void) if(!m_bTrainStopping){ m_nDoorTimer = CTimer::GetTimeInMilliseconds() + 1000; m_nDoorState = TRAIN_DOOR_CLOSING; - DMAudio.PlayOneShot(m_audioEntityId, SOUND_19, 0.0f); + DMAudio.PlayOneShot(m_audioEntityId, SOUND_TRAIN_DOOR_OPEN, 0.0f); } break; diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index c9b6c9e3..48546e68 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -265,8 +265,11 @@ public: void InflictDamage(CEntity *damagedBy, eWeaponType weaponType, float damage); void DoFixedMachineGuns(void); - +#ifdef FIX_BUGS + bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1 && GetStatus() != STATUS_WRECKED; } +#else bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1; } +#endif CVehicleModelInfo* GetModelInfo() { return (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); } bool IsTaxi(void) { return GetModelIndex() == MI_TAXI || GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_BORGNINE; } AnimationId GetDriverAnim(void) { return IsCar() && bLowVehicle ? ANIM_CAR_LSIT : (IsBoat() && GetModelIndex() != MI_SPEEDER ? ANIM_DRIVE_BOAT : ANIM_CAR_SIT); } |