diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index fbbd09af8b270a58deee364d75df247bf984a3bf..8ad8931e32ddaff68a1ac89b57e1431003da9464 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
procedure SetWeaponPrefs(Prefs: Array of Byte);
procedure SetWeaponPref(Weapon, Pref: Byte);
function GetWeaponPref(Weapon: Byte) : Byte;
+ function GetMorePrefered() : Byte;
function Collide(X, Y: Integer; Width, Height: Word): Boolean; overload;
function Collide(Panel: TPanel): Boolean; overload;
function Collide(X, Y: Integer): Boolean; overload;
result := FWeapPreferences[Weapon];
end;
+function TPlayer.GetMorePrefered() : Byte;
+var testedWeap, i: Byte;
+begin
+ testedWeap := FCurrWeap;
+ for i := WP_FIRST to WP_LAST do
+ if FWeapon[i] and (FWeapPreferences[i] > FWeapPreferences[testedWeap]) then
+ testedWeap := i;
+ if (R_BERSERK in FRulez) and (FWeapPreferences[WP_LAST + 1] > FWeapPreferences[testedWeap]) then
+ testedWeap := WEAPON_KASTET;
+ result := testedWeap;
+end;
+
procedure TPlayer.SwitchTeam;
begin
if g_Game_IsClient then