X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_menu.pas;h=ed6d3ef3261cb8bb9e655389d5e29dddadcae2cd;hb=b00b458845d9f1bcf5d7643c47aaad4455600eb2;hp=6f351683332b19aa23e217808de3688ff572db48;hpb=3bc93c7ecd534237343aaa3b83dca053c53b9bc5;p=d2df-sdl.git

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 6f35168..ed6d3ef 100644
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -407,8 +407,7 @@ begin
         if gPlayer1.Team <> gPlayer1Settings.Team then
           gPlayer1.SwitchTeam;
       gPlayer1.WeapSwitchMode := gPlayer1Settings.WeaponSwitch;
-      if (gPlayer1.WeapSwitchMode = 2) then
-        gPlayer1.setWeaponPrefs(gPlayer1Settings.WeaponPreferences);
+      gPlayer1.setWeaponPrefs(gPlayer1Settings.WeaponPreferences);
       gPlayer1.SwitchToEmpty := gPlayer1Settings.SwitchToEmpty;
       gPlayer1.SkipFist := gPlayer1Settings.SkipFist;
       if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
@@ -424,14 +423,17 @@ begin
         if gPlayer2.Team <> gPlayer2Settings.Team then
           gPlayer2.SwitchTeam;
       gPlayer2.WeapSwitchMode := gPlayer2Settings.WeaponSwitch;
-      if (gPlayer2.WeapSwitchMode = 2) then
-        gPlayer2.setWeaponPrefs(gPlayer2Settings.WeaponPreferences);
+      gPlayer2.setWeaponPrefs(gPlayer2Settings.WeaponPreferences);
       gPlayer2.SwitchToEmpty := gPlayer2Settings.SwitchToEmpty;
       gPlayer2.SkipFist := gPlayer2Settings.SkipFist;
     end;
   end;
 
-  if g_Game_IsClient then MC_SEND_PlayerSettings;
+  if g_Game_IsClient then
+  begin
+    MC_SEND_PlayerSettings;
+    gPlayer1.setWeaponPrefs(gPlayer1Settings.WeaponPreferences);
+  end;
 
   g_Console_WriteGameConfig;
 end;
@@ -439,7 +441,7 @@ end;
 procedure ReadOptions();
 var
   menu: TGUIMenu;
-  i, a: Integer;
+  i: Integer;
 begin
   menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
 
@@ -2185,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');