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/AudioLogic.cpp | |
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 '')
-rw-r--r-- | src/audio/AudioLogic.cpp | 16 |
1 files changed, 6 insertions, 10 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; } } } |