Merge branch 'miami' into lcs

# Conflicts:
#	src/audio/AudioLogic.cpp
This commit is contained in:
Sergeanur
2021-05-12 03:29:36 +03:00
9 changed files with 10767 additions and 1367 deletions

View File

@@ -1121,8 +1121,8 @@ CPed::ProcessObjective(void)
SetMoveState(PEDMOVE_STILL);
if (m_objective == OBJECTIVE_HASSLE_CHAR) {
Say(SOUND_PED_COP_REACTION);
m_pedInObjective->Say(SOUND_PED_UNK_126);
Say(SOUND_PED_COP_ASK_FOR_ID);
m_pedInObjective->Say(SOUND_PED_INNOCENT);
m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 3000;
m_pedInObjective->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 3000;
SetObjective(OBJECTIVE_WANDER);