summaryrefslogtreecommitdiffstats
path: root/src/peds/PedFight.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-13 13:41:24 +0100
committeraap <aap@papnet.eu>2021-01-13 13:41:24 +0100
commit6aab948be2fe3a1c09984ced7a48e56ec145c23e (patch)
tree9284d6071a2ed7a085f79d5f7043eed00340cf15 /src/peds/PedFight.cpp
parentanim velocity union (diff)
downloadre3-6aab948be2fe3a1c09984ced7a48e56ec145c23e.tar
re3-6aab948be2fe3a1c09984ced7a48e56ec145c23e.tar.gz
re3-6aab948be2fe3a1c09984ced7a48e56ec145c23e.tar.bz2
re3-6aab948be2fe3a1c09984ced7a48e56ec145c23e.tar.lz
re3-6aab948be2fe3a1c09984ced7a48e56ec145c23e.tar.xz
re3-6aab948be2fe3a1c09984ced7a48e56ec145c23e.tar.zst
re3-6aab948be2fe3a1c09984ced7a48e56ec145c23e.zip
Diffstat (limited to 'src/peds/PedFight.cpp')
-rw-r--r--src/peds/PedFight.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp
index b57f1943..8625f23e 100644
--- a/src/peds/PedFight.cpp
+++ b/src/peds/PedFight.cpp
@@ -1793,7 +1793,7 @@ CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCount
SetStoredState();
bFindNewNodeAfterStateRestore = false;
SetPedState(PED_INVESTIGATE);
- m_standardTimer = CTimer::GetTimeInMilliseconds() + time;
+ m_chatTimer = CTimer::GetTimeInMilliseconds() + time;
m_eventType = event;
m_eventOrThreat = pos;
m_distanceToCountSeekDone = distanceToCountDone;
@@ -1816,13 +1816,13 @@ CPed::InvestigateEvent(void)
if (m_nWaitState == WAITSTATE_TURN180)
return;
- if (CTimer::GetTimeInMilliseconds() > m_standardTimer) {
+ if (CTimer::GetTimeInMilliseconds() > m_chatTimer) {
- if (m_standardTimer) {
+ if (m_chatTimer) {
if (m_eventType < EVENT_ASSAULT_NASTYWEAPON)
SetWaitState(WAITSTATE_TURN180, nil);
- m_standardTimer = 0;
+ m_chatTimer = 0;
} else {
ClearInvestigateEvent();
}
@@ -1882,7 +1882,7 @@ CPed::InvestigateEvent(void)
Say(SOUND_PED_CHAT_EVENT);
} else {
- m_standardTimer = 0;
+ m_chatTimer = 0;
}
} else if (CTimer::GetTimeInMilliseconds() > m_lookTimer) {
@@ -2021,7 +2021,7 @@ CPed::ClearInvestigateEvent(void)
animAssoc->flags |= ASSOC_DELETEFADEDOUT;
}
if (m_eventType > EVENT_EXPLOSION)
- m_standardTimer = CTimer::GetTimeInMilliseconds() + 15000;
+ m_chatTimer = CTimer::GetTimeInMilliseconds() + 15000;
bGonnaInvestigateEvent = false;
m_pEventEntity = nil;