diff options
| author | aap <aap@papnet.eu> | 2021-01-13 13:41:31 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-01-13 13:41:31 +0100 |
| commit | ac3ba5b4a651d9557167af73acef65dfcd084933 (patch) | |
| tree | 7015c7f3d85bf5f164617ac1d3049d86ae7a3c98 /src/peds/PedFight.cpp | |
| parent | anim velocity union (diff) | |
| download | re3-ac3ba5b4a651d9557167af73acef65dfcd084933.tar re3-ac3ba5b4a651d9557167af73acef65dfcd084933.tar.gz re3-ac3ba5b4a651d9557167af73acef65dfcd084933.tar.bz2 re3-ac3ba5b4a651d9557167af73acef65dfcd084933.tar.lz re3-ac3ba5b4a651d9557167af73acef65dfcd084933.tar.xz re3-ac3ba5b4a651d9557167af73acef65dfcd084933.tar.zst re3-ac3ba5b4a651d9557167af73acef65dfcd084933.zip | |
Diffstat (limited to 'src/peds/PedFight.cpp')
| -rw-r--r-- | src/peds/PedFight.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp index eaa2aa3d..e0ffa82e 100644 --- a/src/peds/PedFight.cpp +++ b/src/peds/PedFight.cpp @@ -2404,7 +2404,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; @@ -2428,13 +2428,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_UNK) SetWaitState(WAITSTATE_TURN180, nil); - m_standardTimer = 0; + m_chatTimer = 0; } else { ClearInvestigateEvent(); } @@ -2495,7 +2495,7 @@ CPed::InvestigateEvent(void) Say(SOUND_PED_CHAT_EVENT); } else { - m_standardTimer = 0; + m_chatTimer = 0; } } else if (CTimer::GetTimeInMilliseconds() > m_lookTimer) { @@ -2639,7 +2639,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; |