diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 6f351683332b19aa23e217808de3688ff572db48..c6910e749465d055572696be93cdbad1d1f014b8 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;