diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-02-02 15:02:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-02 15:02:15 +0100 |
| commit | 3c80b07d120244b6c671f3dc99bcc9c4034998be (patch) | |
| tree | ab7c893d774ed6a07d0d83d729b5df7a08df5b7b /src/peds | |
| parent | fixed firetruck crash (diff) | |
| parent | Some fixes and some cosmetic things (diff) | |
| download | re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.gz re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.bz2 re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.lz re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.xz re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.zst re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.cpp | 12 | ||||
| -rw-r--r-- | src/peds/Ped.h | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 797262d4..f7578bac 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -273,7 +273,6 @@ static char WaitStateText[][16] = { }; #ifdef TOGGLEABLE_BETA_FEATURES -bool CPed::bUnusedFightThingOnPlayer = false; bool CPed::bPopHeadsOnHeadshot = false; bool CPed::bMakePedsRunToPhonesToReportCrimes = false; #endif @@ -1068,6 +1067,7 @@ CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg) if (attackAssoc) { switch (attackAssoc->animId) { case ANIM_WEAPON_START_THROW: + // what?! if ((!ped->IsPlayer() || ((CPlayerPed*)ped)->m_bHaveTargetSelected) && ped->IsPlayer()) { attackAssoc->blendDelta = -1000.0f; newAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_WEAPON_THROWU); @@ -1929,13 +1929,13 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase) float limitedDest = CGeneral::LimitRadianAngle(m_fRotationDest); float timeUntilStateChange = (m_nPedStateTimer - CTimer::GetTimeInMilliseconds())/600.0f; - m_vecOffsetSeek.z = 0.0f; if (timeUntilStateChange <= 0.0f) { m_vecOffsetSeek.x = 0.0f; m_vecOffsetSeek.y = 0.0f; - } else { - neededPos -= timeUntilStateChange * m_vecOffsetSeek; } + m_vecOffsetSeek.z = 0.0f; + + neededPos -= timeUntilStateChange * m_vecOffsetSeek; if (PI + m_fRotationCur < limitedDest) { limitedDest -= 2 * PI; @@ -4827,10 +4827,6 @@ CPed::StartFightAttack(uint8 buttonPressure) animAssoc->SetFinishCallback(FinishFightMoveCB, this); m_fightState = FIGHTSTATE_NO_MOVE; m_takeAStepAfterAttack = false; -#ifdef TOGGLEABLE_BETA_FEATURES - m_takeAStepAfterAttack = IsPlayer() && bUnusedFightThingOnPlayer; -#endif - bIsAttacking = true; if (IsPlayer()) diff --git a/src/peds/Ped.h b/src/peds/Ped.h index b421bc83..50c1fc39 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -824,7 +824,6 @@ public: static CPedAudioData (&CommentWaitTime)[38]; #ifdef TOGGLEABLE_BETA_FEATURES - static bool bUnusedFightThingOnPlayer; static bool bPopHeadsOnHeadshot; static bool bMakePedsRunToPhonesToReportCrimes; #endif |