diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-22 14:04:09 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-22 14:04:09 +0100 |
| commit | cea6b20c09532c3321c45f18ce36ec34fe836d1f (patch) | |
| tree | bd6376dac146895eb1f0c1de37f1cf2e2bfdb19f /src/audio | |
| parent | CMessages::GetTokenPadKeyString (diff) | |
| parent | get rid of most --MIAMI comments (diff) | |
| download | re3-cea6b20c09532c3321c45f18ce36ec34fe836d1f.tar re3-cea6b20c09532c3321c45f18ce36ec34fe836d1f.tar.gz re3-cea6b20c09532c3321c45f18ce36ec34fe836d1f.tar.bz2 re3-cea6b20c09532c3321c45f18ce36ec34fe836d1f.tar.lz re3-cea6b20c09532c3321c45f18ce36ec34fe836d1f.tar.xz re3-cea6b20c09532c3321c45f18ce36ec34fe836d1f.tar.zst re3-cea6b20c09532c3321c45f18ce36ec34fe836d1f.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 6 | ||||
| -rw-r--r-- | src/audio/PoliceRadio.cpp | 4 | ||||
| -rw-r--r-- | src/audio/sampman_miles.cpp | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 1f32890c..c2050f59 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -305,11 +305,11 @@ cAudioManager::ProcessPlayerMood() playerPed = FindPlayerPed(); if (playerPed != nil) { - if (playerPed->m_pWanted->m_nWantedLevel > 3) { + if (playerPed->m_pWanted->GetWantedLevel() > 3) { m_nPlayerMood = PLAYER_MOOD_ANGRY; return; } - if (playerPed->m_pWanted->m_nWantedLevel > 1) { + if (playerPed->m_pWanted->GetWantedLevel() > 1) { m_nPlayerMood = PLAYER_MOOD_PISSED_OFF; return; } @@ -5684,7 +5684,7 @@ cAudioManager::GetCopTalkSfx(CPed *ped, int16 sound) case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 8494, 4); break; case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 8491, 3); break; case SOUND_PED_PED_COLLISION: - if(FindPlayerPed()->m_pWanted->m_nWantedLevel <= 0) return NO_SAMPLE; + if(FindPlayerPed()->m_pWanted->GetWantedLevel() <= 0) return NO_SAMPLE; GetPhrase(sfx, ped->m_lastComment, 8476, 5); break; default: return GetGenericMaleTalkSfx(ped, sound); diff --git a/src/audio/PoliceRadio.cpp b/src/audio/PoliceRadio.cpp index 07dfb890..a2a765ed 100644 --- a/src/audio/PoliceRadio.cpp +++ b/src/audio/PoliceRadio.cpp @@ -136,7 +136,7 @@ cAudioManager::ServicePoliceRadio() #endif CPlayerPed *playerPed = FindPlayerPed(); if (playerPed) { - wantedLevel = playerPed->m_pWanted->m_nWantedLevel; + wantedLevel = playerPed->m_pWanted->GetWantedLevel(); if (!crimeReport) { if (wantedLevel != 0) { if (nLastSeen != 0) @@ -652,7 +652,7 @@ void cAudioManager::ReportCrime(eCrimeType type, const CVector &pos) { int32 lastCrime = ARRAY_SIZE(m_sPoliceRadioQueue.crimes); - if (m_bIsInitialised && MusicManager.m_nMusicMode != MUSICMODE_CUTSCENE && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 && + if (m_bIsInitialised && MusicManager.m_nMusicMode != MUSICMODE_CUTSCENE && FindPlayerPed()->m_pWanted->GetWantedLevel() > 0 && (type > CRIME_NONE || type < NUM_CRIME_TYPES) && m_FrameCounter >= gMinTimeToNextReport[type]) { for (int32 i = 0; i < ARRAY_SIZE(m_sPoliceRadioQueue.crimes); i++) { if (m_sPoliceRadioQueue.crimes[i].type != CRIME_NONE) { diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 78de4e6b..44be3b1c 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -20,8 +20,6 @@ #pragma comment( lib, "mss32.lib" ) -// --MIAMI: file done - cSampleManager SampleManager; uint32 BankStartOffset[MAX_SFX_BANKS]; /////////////////////////////////////////////////////////////// |