From 03fc85bfe06b781a50ac2ea6dfb1b2f9871cfbf4 Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 16 Jul 2019 18:41:30 +0200 Subject: fixed merge --- src/peds/Ped.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 7e24faa6..e81dfa51 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -48,7 +48,6 @@ WRAPPER void CPed::RegisterThreatWithGangPeds(CEntity*) { EAXJMP(0x4E3870); } WRAPPER void CPed::MakeChangesForNewWeapon(int8) { EAXJMP(0x4F2560); } WRAPPER void CPed::SetSeek(CVector, float) { EAXJMP(0x4D14B0); } WRAPPER bool CPed::Seek(void) { EAXJMP(0x4D1640); } -WRAPPER void CPed::ClearAll(void) { EAXJMP(0x4C7F20); } WRAPPER void CPed::SetWanderPath(int8) { EAXJMP(0x4D2750); } WRAPPER void CPed::SetFollowPath(CVector) { EAXJMP(0x4D2EA0); } @@ -3053,7 +3052,7 @@ CPed::CheckForPointBlankPeds(CPed *pedToVerify) neededAngle = CGeneral::LimitRadianAngle(neededAngle); m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur); - float neededTurn = Abs(neededTurn - m_fRotationCur); + float neededTurn = Abs(neededAngle - m_fRotationCur); if (neededTurn > PI) neededTurn = 2*PI - neededTurn; -- cgit v1.2.3