diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 6f351683332b19aa23e217808de3688ff572db48..f2e3d86e2b388abb6774daf5b096d617c49ae4f4 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
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);
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;
procedure ReadOptions();
var
menu: TGUIMenu;
- i, a: Integer;
+ i: Integer;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
var
Menu: TGUIWindow;
//SR: TSearchRec;
- a, cx, _y, i, x: Integer;
+ a, cx, _y, i: Integer;
//list: SSArray;
begin
Menu := TGUIWindow.Create('MainMenu');
Name := 'mmNewGameMenu';
AddButton(@ProcSingle1Player, _lc[I_MENU_1_PLAYER]);
AddButton(@ProcSingle2Players, _lc[I_MENU_2_PLAYERS]);
- AddButton(nil, _lc[I_MENU_CUSTOM_GAME], 'CustomGameMenu');
AddButton(@ProcSelectCampaignMenu, _lc[I_MENU_CAMPAIGN], 'CampaignMenu');
+ AddButton(nil, _lc[I_MENU_CUSTOM_GAME], 'CustomGameMenu');
end;
Menu.DefControl := 'mmNewGameMenu';
g_GUI_AddWindow(Menu);