summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-22 00:20:51 +0100
committerwithmorten <morten.with@gmail.com>2021-01-22 00:20:51 +0100
commitd1317f8fa649120f841f8c1f8bcf17b3ee74c235 (patch)
tree5adc99bd4296a54cc49354b291876603a72eed6e /src/audio
parentfuck (diff)
downloadre3-d1317f8fa649120f841f8c1f8bcf17b3ee74c235.tar
re3-d1317f8fa649120f841f8c1f8bcf17b3ee74c235.tar.gz
re3-d1317f8fa649120f841f8c1f8bcf17b3ee74c235.tar.bz2
re3-d1317f8fa649120f841f8c1f8bcf17b3ee74c235.tar.lz
re3-d1317f8fa649120f841f8c1f8bcf17b3ee74c235.tar.xz
re3-d1317f8fa649120f841f8c1f8bcf17b3ee74c235.tar.zst
re3-d1317f8fa649120f841f8c1f8bcf17b3ee74c235.zip
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/AudioLogic.cpp6
-rw-r--r--src/audio/PoliceRadio.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index b5127fc5..7d759279 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;
}
@@ -5678,7 +5678,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 30fcbde0..cf6f5bee 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)
@@ -653,7 +653,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) {