X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=19d6be55027fbad4ea488a2915b2d034f5a464e0;hp=1945f94f26be4d2c1a69de7416209db816648a5f;hb=51998d817120cd3833df7bae3d355642fd4abde5;hpb=cbb81a52dd4f9a0552283b2031dec999dba0a824

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 1945f94..19d6be5 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -634,6 +634,7 @@ procedure g_Bot_Add(Team, Difficult: Byte; Handicap: Integer = 100);
 procedure g_Bot_AddList(Team: Byte; lname: ShortString; num: Integer = -1; Handicap: Integer = 100);
 procedure g_Bot_MixNames();
 procedure g_Bot_RemoveAll();
+function g_Bot_GetCount(): Integer;
 
 implementation
 
@@ -944,6 +945,9 @@ var
 begin
   if not g_Game_IsServer then Exit;
 
+// Íå äîáàâëÿåì áîòîâ åñëè ëèìèò óæå äîñòèãíóò
+  if (g_Bot_GetCount() >= gMaxBots) then Exit;
+
 // Ñïèñîê íàçâàíèé ìîäåëåé:
   m := g_PlayerModel_GetNames();
   if m = nil then
@@ -1041,6 +1045,9 @@ var
 begin
   if not g_Game_IsServer then Exit;
 
+// Íå äîáàâëÿåì áîòîâ åñëè ëèìèò óæå äîñòèãíóò
+  if (g_Bot_GetCount() >= gMaxBots) then Exit;
+
 // Ñïèñîê íàçâàíèé ìîäåëåé:
   m := g_PlayerModel_GetNames();
   if m = nil then
@@ -1408,6 +1415,20 @@ begin
       Result := Result + 1;
 end;
 
+function g_Bot_GetCount(): Integer;
+var
+  a: Integer;
+begin
+  Result := 0;
+
+  if gPlayers = nil then
+    Exit;
+
+  for a := 0 to High(gPlayers) do
+    if (gPlayers[a] <> nil) and (gPlayers[a] is TBot) then
+      Result := Result + 1;
+end;
+
 function g_Player_GetStats(): TPlayerStatArray;
 var
   a: Integer;
@@ -2036,7 +2057,7 @@ var
 begin
   testedWeap := FCurrWeap;
   for i := WP_FIRST to WP_LAST do
-    if FWeapon[i] and (FWeapPreferences[i] > FWeapPreferences[testedWeap]) then
+    if FWeapon[i] and maySwitch(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;
@@ -3978,16 +3999,6 @@ begin
 end;
 
 function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean;
-
-  function allowBerserkSwitching (): Boolean;
-  begin
-    if (FBFGFireCounter <> -1) then begin result := false; exit; end;
-    result := true;
-    if gBerserkAutoswitch then exit;
-    if not conIsCheatsEnabled then exit;
-    result := false;
-  end;
-
 var
   a: Boolean;
   switchWeapon: Byte = 255;
@@ -4343,8 +4354,12 @@ begin
         if not (R_BERSERK in FRulez) then
         begin
           Include(FRulez, R_BERSERK);
-          if (shouldSwitch(WP_LAST + 1, false)) then
-            QueueWeaponSwitch(WEAPON_KASTET);
+          if (FBFGFireCounter = -1) then
+          begin
+            FCurrWeap := WEAPON_KASTET;
+            resetWeaponQueue();
+            FModel.SetWeapon(WEAPON_KASTET);
+          end;
           if gFlash <> 0 then
           begin
             Inc(FPain, 100);
@@ -8040,7 +8055,6 @@ end;
 
 
 begin
-  conRegVar('cheat_berserk_autoswitch', @gBerserkAutoswitch, 'autoswitch to fist when berserk pack taken', '',  true, true);
   conRegVar('player_indicator', @gPlayerIndicator, 'Draw indicator only for current player, also for teammates, or not at all', 'Draw indicator only for current player, also for teammates, or not at all');
   conRegVar('player_indicator_style', @gPlayerIndicatorStyle, 'Visual appearance of indicator', 'Visual appearance of indicator');
 end.