diff options
author | aap <aap@papnet.eu> | 2020-11-11 09:37:10 +0100 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-11-11 09:38:33 +0100 |
commit | 48d0653331c8b1debc9d985131c9ea31a0e0c97f (patch) | |
tree | aadeefe2bf09efd2dde21fefed5a8cf0ed553518 /src/peds | |
parent | move stuff into define (diff) | |
parent | Merge pull request #771 from theR4K/miamiDev (diff) | |
download | re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.gz re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.bz2 re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.lz re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.xz re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.tar.zst re3-48d0653331c8b1debc9d985131c9ea31a0e0c97f.zip |
Diffstat (limited to 'src/peds')
-rw-r--r-- | src/peds/Ped.cpp | 2 | ||||
-rw-r--r-- | src/peds/Ped.h | 2 | ||||
-rw-r--r-- | src/peds/PlayerPed.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 15eb79b6..3a04b196 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -522,7 +522,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) m_delayedSoundID = -1; m_delayedSoundTimer = 0; CPopulation::UpdatePedCount((ePedType)m_nPedType, false); - m_lastComment = -1; + m_lastComment = UINT32_MAX; } // --MIAMI: Done diff --git a/src/peds/Ped.h b/src/peds/Ped.h index aa0a69db..6fc9ab67 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -646,7 +646,7 @@ public: uint16 m_lastQueuedSound; uint16 m_queuedSound; bool m_canTalk; - int32 m_lastComment; + uint32 m_lastComment; CVector m_vecSeekPosEx; // used for OBJECTIVE_GUARD_SPOT float m_distanceToCountSeekDoneEx; // used for OBJECTIVE_GUARD_SPOT diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 1f53853f..24718b19 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -1055,6 +1055,7 @@ CPlayerPed::FindWeaponLockOnTarget(void) if (nextTarget) nextTarget->RegisterReference((CEntity**)&m_pPointGunAt); SetPointGunAt(nextTarget); + Say(SOUND_PED_AIMING); return true; } |