diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-29 18:40:10 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-29 18:40:10 +0200 |
| commit | c5c887cc11ce9ac5cbcd9683ab7673da65bab612 (patch) | |
| tree | cc8e4cc133a2aa7d7f15e42adb6f17dfbb05f190 /src/peds | |
| parent | script revision p1 (diff) | |
| parent | Fix bugs in cAudioManager::DirectlyEnqueueSample (diff) | |
| download | re3-c5c887cc11ce9ac5cbcd9683ab7673da65bab612.tar re3-c5c887cc11ce9ac5cbcd9683ab7673da65bab612.tar.gz re3-c5c887cc11ce9ac5cbcd9683ab7673da65bab612.tar.bz2 re3-c5c887cc11ce9ac5cbcd9683ab7673da65bab612.tar.lz re3-c5c887cc11ce9ac5cbcd9683ab7673da65bab612.tar.xz re3-c5c887cc11ce9ac5cbcd9683ab7673da65bab612.tar.zst re3-c5c887cc11ce9ac5cbcd9683ab7673da65bab612.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/EmergencyPed.cpp | 2 | ||||
| -rw-r--r-- | src/peds/Ped.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/peds/EmergencyPed.cpp b/src/peds/EmergencyPed.cpp index 954c1c79..0257d291 100644 --- a/src/peds/EmergencyPed.cpp +++ b/src/peds/EmergencyPed.cpp @@ -206,7 +206,7 @@ CEmergencyPed::MedicAI(void) if (!waitUntilMedicEntersCar) { CCarCtrl::JoinCarWithRoadSystem(m_pMyVehicle); m_pMyVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE; - m_pMyVehicle->m_bSirenOrAlarm = 0; + m_pMyVehicle->m_bSirenOrAlarm = false; m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 12; m_pMyVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_SLOW_DOWN_FOR_CARS; if (m_pMyVehicle->bIsAmbulanceOnDuty) { diff --git a/src/peds/Ped.h b/src/peds/Ped.h index d1d08c2f..f415b386 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -822,8 +822,10 @@ public: void RestorePreviousObjective(void); void SetIdle(void); #ifdef _MSC_VER +#if _MSC_VER >= 1920 && _MSC_VER < 1929 __declspec(noinline) // workaround for a compiler bug, hooray MS :P #endif +#endif void SetObjective(eObjective, void*); void SetObjective(eObjective); void SetObjective(eObjective, int16, int16); |