Fix build and use enum in ProcessPlayerMood

This commit is contained in:
Roman Masanin 2020-10-26 14:02:11 +03:00
parent 4bcd176944
commit c3cbf4353d
2 changed files with 17 additions and 21 deletions

View file

@ -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;
}
}
}