summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-06-30 02:31:10 +0200
committererorcun <erorcunerorcun@hotmail.com.tr>2021-06-30 02:31:10 +0200
commit9f0daee186dc815cbf4e8a68871d375bd4752737 (patch)
treecc2ec2e0ade1a44232d97b113bbeda96aa4c8a6f
parentfix no VALIDATE_SAVE_SIZE build (diff)
downloadre3-9f0daee186dc815cbf4e8a68871d375bd4752737.tar
re3-9f0daee186dc815cbf4e8a68871d375bd4752737.tar.gz
re3-9f0daee186dc815cbf4e8a68871d375bd4752737.tar.bz2
re3-9f0daee186dc815cbf4e8a68871d375bd4752737.tar.lz
re3-9f0daee186dc815cbf4e8a68871d375bd4752737.tar.xz
re3-9f0daee186dc815cbf4e8a68871d375bd4752737.tar.zst
re3-9f0daee186dc815cbf4e8a68871d375bd4752737.zip
-rw-r--r--src/audio/sampman_oal.cpp12
-rw-r--r--src/peds/CopPed.cpp3
-rw-r--r--src/peds/PedFight.cpp2
-rw-r--r--src/peds/PlayerPed.cpp8
4 files changed, 14 insertions, 11 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 5d6b0dc3..6740f08f 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -1250,14 +1250,14 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
{
ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
- int8 slot;
-
for ( int32 i = 0; i < _TODOCONST(3); i++ )
{
- slot = nCurrentPedSlot - i - 1;
#ifdef FIX_BUGS
+ int8 slot = (int8)nCurrentPedSlot - i - 1;
if (slot < 0)
slot += ARRAY_SIZE(nPedSlotSfx);
+#else
+ uint8 slot = nCurrentPedSlot - i - 1;
#endif
if ( nComment == nPedSlotSfx[slot] )
return TRUE;
@@ -1270,14 +1270,14 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
int32
cSampleManager::_GetPedCommentSlot(uint32 nComment)
{
- int8 slot;
-
for (int32 i = 0; i < _TODOCONST(3); i++)
{
- slot = nCurrentPedSlot - i - 1;
#ifdef FIX_BUGS
+ int8 slot = (int8)nCurrentPedSlot - i - 1;
if (slot < 0)
slot += ARRAY_SIZE(nPedSlotSfx);
+#else
+ uint8 slot = nCurrentPedSlot - i - 1;
#endif
if (nComment == nPedSlotSfx[slot])
return slot;
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp
index 1efd7733..fbfa7249 100644
--- a/src/peds/CopPed.cpp
+++ b/src/peds/CopPed.cpp
@@ -644,6 +644,9 @@ CCopPed::ProcessControl(void)
int numCopsNear = 0;
for (int i = 0; i < player->m_numNearPeds; ++i) {
CPed *nearPed = player->m_nearPeds[i];
+#ifdef FIX_BUGS
+ if (nearPed)
+#endif
if (nearPed->m_nPedType == PEDTYPE_COP && nearPed->m_nPedState != PED_DEAD)
++numCopsNear;
}
diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp
index 7bcf6b6c..8e377c81 100644
--- a/src/peds/PedFight.cpp
+++ b/src/peds/PedFight.cpp
@@ -1304,7 +1304,7 @@ CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
if (IsPlayer())
moveAssoc->speed = 1.2f;
- m_takeAStepAfterAttack = 0;
+ m_takeAStepAfterAttack = false;
m_fightButtonPressure = 0;
} else if (IsPlayer() && GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED && GetWeapon()->m_eWeaponType != WEAPONTYPE_BRASSKNUCKLE &&
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index b4e7f647..d54dedd9 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -837,8 +837,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;
}
@@ -2081,8 +2081,8 @@ void
CPlayerPed::RemovePedFromMeleeList(CPed *ped)
{
int i = 0;
- for (; m_pMeleeList[i] != ped; i++) {
- if (i >= ARRAY_SIZE(m_pMeleeList))
+ while (m_pMeleeList[i] != ped) {
+ if (++i >= ARRAY_SIZE(m_pMeleeList))
return;
}
m_pMeleeList[i] = nil;