diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-13 21:15:33 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-13 21:15:33 +0100 |
| commit | 97c9a4a02c9f801d35fbcf47658756a89a33f6d9 (patch) | |
| tree | 232709023f42a318c0588b61f4de2c91b724a5b1 /src/peds/PedFight.cpp | |
| parent | Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs (diff) | |
| download | re3-97c9a4a02c9f801d35fbcf47658756a89a33f6d9.tar re3-97c9a4a02c9f801d35fbcf47658756a89a33f6d9.tar.gz re3-97c9a4a02c9f801d35fbcf47658756a89a33f6d9.tar.bz2 re3-97c9a4a02c9f801d35fbcf47658756a89a33f6d9.tar.lz re3-97c9a4a02c9f801d35fbcf47658756a89a33f6d9.tar.xz re3-97c9a4a02c9f801d35fbcf47658756a89a33f6d9.tar.zst re3-97c9a4a02c9f801d35fbcf47658756a89a33f6d9.zip | |
Diffstat (limited to '')
| -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 d1f39491..0f83cdd1 100644 --- a/src/peds/PedFight.cpp +++ b/src/peds/PedFight.cpp @@ -2418,7 +2418,7 @@ CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCount SetStoredState(); bFindNewNodeAfterStateRestore = false; SetPedState(PED_INVESTIGATE); - m_chatTimer = CTimer::GetTimeInMilliseconds() + time; + m_standardTimer = CTimer::GetTimeInMilliseconds() + time; m_eventType = event; m_eventOrThreat = pos; m_distanceToCountSeekDone = distanceToCountDone; @@ -2442,13 +2442,13 @@ CPed::InvestigateEvent(void) if (m_nWaitState == WAITSTATE_TURN180) return; - if (CTimer::GetTimeInMilliseconds() > m_chatTimer) { + if (CTimer::GetTimeInMilliseconds() > m_standardTimer) { - if (m_chatTimer) { + if (m_standardTimer) { if (m_eventType < EVENT_UNK) SetWaitState(WAITSTATE_TURN180, nil); - m_chatTimer = 0; + m_standardTimer = 0; } else { ClearInvestigateEvent(); } @@ -2509,7 +2509,7 @@ CPed::InvestigateEvent(void) Say(SOUND_PED_CHAT_EVENT); } else { - m_chatTimer = 0; + m_standardTimer = 0; } } else if (CTimer::GetTimeInMilliseconds() > m_lookTimer) { @@ -2653,7 +2653,7 @@ CPed::ClearInvestigateEvent(void) animAssoc->flags |= ASSOC_DELETEFADEDOUT; } if (m_eventType > EVENT_EXPLOSION) - m_chatTimer = CTimer::GetTimeInMilliseconds() + 15000; + m_standardTimer = CTimer::GetTimeInMilliseconds() + 15000; bGonnaInvestigateEvent = false; m_pEventEntity = nil; |