summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-16 09:52:58 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-16 09:52:58 +0200
commit5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51 (patch)
tree361e17568ce5dd77a8711f196f92324cdef72d10 /src/peds
parentremove debug (diff)
parentMerge branch 'master' into miami (diff)
downloadre3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar
re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.gz
re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.bz2
re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.lz
re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.xz
re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.tar.zst
re3-5abd466b5d62ccb4c3cb5c0a158f2eff65bb7f51.zip
Diffstat (limited to '')
-rw-r--r--src/peds/Ped.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index e67062f0..86333d8c 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -449,8 +449,8 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
m_nPedType = pedType;
m_lastSoundStart = 0;
m_soundStart = 0;
- m_lastQueuedSound = SOUND_TOTAL_PED_SOUNDS;
- m_queuedSound = SOUND_TOTAL_PED_SOUNDS;
+ m_lastQueuedSound = SOUND_NO_SOUND;
+ m_queuedSound = SOUND_NO_SOUND;
m_objective = OBJECTIVE_NONE;
m_prevObjective = OBJECTIVE_NONE;
CharCreatedBy = RANDOM_CHAR;
@@ -5922,7 +5922,7 @@ CPed::PlayHitSound(CPed *hitTo)
S42 = SOUND_FIGHT_PUNCH_FROM_BEHIND_42,
S43 = SOUND_FIGHT_KNEE_OR_KICK_43,
S44 = SOUND_FIGHT_KICK_44,
- NO_SND = SOUND_TOTAL_PED_SOUNDS
+ NO_SND = SOUND_NO_SOUND
};
uint16 hitSoundsByFightMoves[12][10] = {
{S39,S42,S43,S43,S39,S39,S39,S39,S39,S42},
@@ -16791,7 +16791,7 @@ CPed::ServiceTalking(void)
} else {
m_queuedSound = SOUND_PED_BOMBER;
}
- if (m_queuedSound != SOUND_TOTAL_PED_SOUNDS) {
+ if (m_queuedSound != SOUND_NO_SOUND) {
if (m_queuedSound == SOUND_PED_DEATH)
m_soundStart = CTimer::GetTimeInMilliseconds() - 1;
@@ -16803,7 +16803,7 @@ CPed::ServiceTalking(void)
+ CTimer::GetTimeInMilliseconds()
+ CGeneral::GetRandomNumberInRange(0, CommentWaitTime[m_queuedSound - SOUND_PED_DEATH].m_nOverrideFixedDelayTime);
m_lastQueuedSound = m_queuedSound;
- m_queuedSound = SOUND_TOTAL_PED_SOUNDS;
+ m_queuedSound = SOUND_NO_SOUND;
}
}
}