diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-10-26 12:02:11 +0100 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-10-26 12:02:11 +0100 |
| commit | c3cbf4353d284b1f0f6280a0495085d8221f30e8 (patch) | |
| tree | 6cbe3dc53531f171a27d2c0f22b69fc4c6b59c72 /src/audio | |
| parent | fix merge (diff) | |
| download | re3-c3cbf4353d284b1f0f6280a0495085d8221f30e8.tar re3-c3cbf4353d284b1f0f6280a0495085d8221f30e8.tar.gz re3-c3cbf4353d284b1f0f6280a0495085d8221f30e8.tar.bz2 re3-c3cbf4353d284b1f0f6280a0495085d8221f30e8.tar.lz re3-c3cbf4353d284b1f0f6280a0495085d8221f30e8.tar.xz re3-c3cbf4353d284b1f0f6280a0495085d8221f30e8.tar.zst re3-c3cbf4353d284b1f0f6280a0495085d8221f30e8.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 16 | ||||
| -rw-r--r-- | src/audio/AudioManager.h | 22 |
2 files changed, 17 insertions, 21 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 40e0ba6c..1fdba82a 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -307,20 +307,16 @@ cAudioManager::ProcessPlayerMood() if (m_nPlayerMoodTimer <= curTime) { playerPed = FindPlayerPed(); if (playerPed != nil) { -/* + if (playerPed->m_pWanted->m_nWantedLevel > 3) { - m_nPlayerMood = 2; + m_nPlayerMood = PLAYER_MOOD_ANGRY; return; } if (playerPed->m_pWanted->m_nWantedLevel > 1) { - m_nPlayerMood = 1; - return; - } -*/ - if (playerPed->m_pWanted->m_nWantedLevel > 1) { - m_nPlayerMood = (playerPed->m_pWanted->m_nWantedLevel > 3) ? 2 : 1; + m_nPlayerMood = PLAYER_MOOD_PISSED_OFF; return; } + lastMisstonPassedTime = CTheScripts::GetLastMissionPassedTime(); if (*lastMisstonPassedTime != -1) { if (curTime < *lastMisstonPassedTime) { @@ -328,11 +324,11 @@ cAudioManager::ProcessPlayerMood() return; } if (curTime < *lastMisstonPassedTime + 180000) { - m_nPlayerMood = 3; + m_nPlayerMood = PLAYER_MOOD_WISECRACKING; return; } } - m_nPlayerMood = 0; + m_nPlayerMood = PLAYER_MOOD_CALM; } } } diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 9a7c754d..97c332a2 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -4,7 +4,7 @@ #include "AudioCollision.h" #include "PoliceRadio.h" #include "VehicleModelInfo.h" -#include "vehicle.h" +#include "Vehicle.h" class tSound { @@ -304,19 +304,19 @@ public: void PreloadMissionAudio(uint8 slot, Const char *name); // done void PreTerminateGameSpecificShutdown(); // done /// processX - main logic of adding new sounds - void ProcessActiveQueues(); // done - bool ProcessAirBrakes(cVehicleParams *params); // done - bool ProcessBoatEngine(cVehicleParams *params); - bool ProcessBoatMovingOverWater(cVehicleParams *params); + void ProcessActiveQueues(); // done + bool ProcessAirBrakes(cVehicleParams *params); // done + bool ProcessBoatEngine(cVehicleParams *params); + bool ProcessBoatMovingOverWater(cVehicleParams *params); #ifdef GTA_BRIDGE - void ProcessBridge(); - void ProcessBridgeMotor(); - void ProcessBridgeOneShots(); - void ProcessBridgeWarning(); + void ProcessBridge(); // done(bcs not exists in VC) + void ProcessBridgeMotor(); // done(bcs not exists in VC) + void ProcessBridgeOneShots(); // done(bcs not exists in VC) + void ProcessBridgeWarning(); // done(bcs not exists in VC) #endif bool ProcessCarBombTick(cVehicleParams *params); // done void ProcessCesna(cVehicleParams *params); // - //void ProcessCrane(); // + //void ProcessCrane(); // done(bcs not exists in VC) bool ProcessEngineDamage(cVehicleParams *params); // done void ProcessEntity(int32 sound); // done void ProcessExplosions(int32 explosion); // done @@ -352,7 +352,7 @@ public: void ProcessScriptObject(int32 id); // done void ProcessSpecial(); // done #ifdef GTA_TRAIN - bool ProcessTrainNoise(cVehicleParams *params); + bool ProcessTrainNoise(cVehicleParams *params); //done(bcs not exists in VC) #endif void ProcessVehicle(CVehicle *vehicle); // done bool ProcessVehicleDoors(cVehicleParams *params); // done |