From 70fa7fc239f9ec09eda218531f240e92d26d5d3a Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Wed, 30 Jun 2021 03:31:10 +0300
Subject: [PATCH] Sanitizer fixes

---
 src/audio/sampman_oal.cpp | 12 ++++++------
 src/peds/PedFight.cpp     |  2 +-
 src/peds/PlayerPed.cpp    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index c566893a..7fb84965 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -1214,14 +1214,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;
@@ -1234,14 +1234,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/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;
 	}