From 251b8e917e5ec31d8fc2d0f0f98a427d37eb6946 Mon Sep 17 00:00:00 2001
From: Stas'M <x86corez@gmail.com>
Date: Sun, 27 Mar 2022 15:58:55 +0300
Subject: [PATCH] Player: Fix compiler warnings

Also fix some warnings in other files.
---
 src/game/g_menu.pas   |  4 ++--
 src/game/g_netmsg.pas |  1 -
 src/game/g_player.pas | 25 ++++++++++++++-----------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index c6910e7..ed6d3ef 100644
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -441,7 +441,7 @@ end;
 procedure ReadOptions();
 var
   menu: TGUIMenu;
-  i, a: Integer;
+  i: Integer;
 begin
   menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
 
@@ -2187,7 +2187,7 @@ procedure CreateAllMenus();
 var
   Menu: TGUIWindow;
   //SR: TSearchRec;
-  a, cx, _y, i, x: Integer;
+  a, cx, _y, i: Integer;
   //list: SSArray;
 begin
   Menu := TGUIWindow.Create('MainMenu');
diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 8b42846..01708c2 100644
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -2680,7 +2680,6 @@ var
   TmpModel: string;
   TmpColor: TRGB;
   TmpTeam: Byte;
-  i: Integer;
   Pl: TPlayer;
   PID: Word;
 begin
diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index f1a38c9..2844773 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -1998,38 +1998,41 @@ begin
 end;
 
 procedure TPlayer.SetWeaponPrefs(Prefs: Array of Byte);
-var i: Integer;
+var
+  i: Integer;
 begin
   for i := WP_FIRST to WP_LAST + 1 do
     begin
-      if (Prefs[i] < 0) or (Prefs[i] > WP_LAST + 1) then
+      if (Prefs[i] > WP_LAST + 1) then
         FWeapPreferences[i] := 0
-      else FWeapPreferences[i] := Prefs[i];
+      else
+        FWeapPreferences[i] := Prefs[i];
     end;
 end;
 
 procedure TPlayer.SetWeaponPref(Weapon, Pref: Byte);
 begin
-  if (Weapon < 0) or (Weapon > WP_LAST + 1) then
+  if (Weapon > WP_LAST + 1) then
     exit
-  else if (Pref >= 0) and (Pref <= WP_LAST + 1) and (Weapon >= 0) and (Weapon <= WP_LAST + 1) then
+  else if (Pref <= WP_LAST + 1) and (Weapon <= WP_LAST + 1) then
     FWeapPreferences[Weapon] := Pref
-  else if (Weapon >= 0) and (Weapon <= WP_LAST + 1) and ((Pref < 0) or (Pref > WP_LAST + 1)) then
+  else if (Weapon <= WP_LAST + 1) and (Pref > WP_LAST + 1) then
     FWeapPreferences[Weapon] := 0;
 end;
 
 function TPlayer.GetWeaponPref(Weapon: Byte) : Byte;
 begin
-  if (Weapon < 0) or (Weapon > WP_LAST + 1) then
+  if (Weapon > WP_LAST + 1) then
     result := 0
-  else if (FWeapPreferences[Weapon] < 0) or (FWeapPreferences[Weapon] > WP_LAST + 1) then
+  else if (FWeapPreferences[Weapon] > WP_LAST + 1) then
     result := 0
   else
     result := FWeapPreferences[Weapon];
 end;
 
 function TPlayer.GetMorePrefered() : Byte;
-var testedWeap, i: Byte;
+var
+  testedWeap, i: Byte;
 begin
   testedWeap := FCurrWeap;
   for i := WP_FIRST to WP_LAST do
@@ -3800,7 +3803,7 @@ end;
 function TPlayer.shouldSwitch (weapon: Byte; hadWeapon: Boolean): Boolean;
 begin
   result := false;
-  if (weapon < 0) or (weapon > WP_LAST + 1) then
+  if (weapon > WP_LAST + 1) then
     begin
       result := false;
       exit;
@@ -3987,7 +3990,7 @@ function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean
 
 var
   a: Boolean;
-  switchWeapon: Byte = -1;
+  switchWeapon: Byte = 255;
   hadWeapon: Boolean = False;
 begin
   Result := False;
-- 
2.29.2