summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-06-30 02:31:10 +0200
committererorcun <erorcunerorcun@hotmail.com.tr>2021-07-03 00:28:32 +0200
commit70fa7fc239f9ec09eda218531f240e92d26d5d3a (patch)
tree3e1d587a5cb7b9c4e6d22214ba3cb393eec2c6a9 /src/peds
parentRefactor OnscreenTimer (diff)
downloadre3-70fa7fc239f9ec09eda218531f240e92d26d5d3a.tar
re3-70fa7fc239f9ec09eda218531f240e92d26d5d3a.tar.gz
re3-70fa7fc239f9ec09eda218531f240e92d26d5d3a.tar.bz2
re3-70fa7fc239f9ec09eda218531f240e92d26d5d3a.tar.lz
re3-70fa7fc239f9ec09eda218531f240e92d26d5d3a.tar.xz
re3-70fa7fc239f9ec09eda218531f240e92d26d5d3a.tar.zst
re3-70fa7fc239f9ec09eda218531f240e92d26d5d3a.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/PedFight.cpp2
-rw-r--r--src/peds/PlayerPed.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp
index c03d492a..46ac369c 100644
--- a/src/peds/PedFight.cpp
+++ b/src/peds/PedFight.cpp
@@ -1044,7 +1044,7 @@ CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
if (IsPlayer())
moveAssoc->speed = 1.3f;
- m_takeAStepAfterAttack = 0;
+ m_takeAStepAfterAttack = false;
m_fightButtonPressure = 0;
} else if (IsPlayer() && m_currentWeapon != WEAPONTYPE_UNARMED) {
CAnimBlendAssociation *moveAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, tFightMoves[m_curFightMove].animId, 4.0f);
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index a67e2abc..93a403bd 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -682,8 +682,8 @@ CPlayerPed::PlayerControlFighter(CPad *padUsed)
if (padMove > 0.0f) {
m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(0.0f, 0.0f, -leftRight, upDown) - TheCamera.Orientation;
- m_takeAStepAfterAttack = padMove > 2 * PAD_MOVE_TO_GAME_WORLD_MOVE;
- if (padUsed->GetSprint() && padMove > 1 * PAD_MOVE_TO_GAME_WORLD_MOVE)
+ m_takeAStepAfterAttack = padMove > (2 * PAD_MOVE_TO_GAME_WORLD_MOVE);
+ if (padUsed->GetSprint() && padMove > (1 * PAD_MOVE_TO_GAME_WORLD_MOVE))
bIsAttacking = false;
}