diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index fe650785d11a8b34baa3b623089b0788e1b37349..9f7aaaa4c53ea09180d2972a0f3c4428dba66fa5 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
gcMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
gcTeamDamage := TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0;
- gcRespawnItems := TGUISwitch(GetControl('swRespawnItems')).ItemIndex = 0;
gcDeathmatchKeys := TGUISwitch(GetControl('swDeathmatchKeys')).ItemIndex = 0;
gcAllowExit := TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0;
gcWeaponStay := TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0;
Options := 0;
if gcTeamDamage then
Options := Options or GAME_OPTION_TEAMDAMAGE;
- if gcRespawnItems then
- Options := Options or GAME_OPTION_RESPAWNITEMS;
if gcDeathmatchKeys then
Options := Options or GAME_OPTION_DMKEYS;
if gcAllowExit then
NetPort := StrToIntDef(TGUIEdit(GetControl('edPort')).Text, 0);
gnTeamDamage := TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0;
- gnRespawnItems := TGUISwitch(GetControl('swRespawnItems')).ItemIndex = 0;
gnDeathmatchKeys := TGUISwitch(GetControl('swDeathmatchKeys')).ItemIndex = 0;
gnAllowExit := TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0;
gnWeaponStay := TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0;
Options := 0;
if gnTeamDamage then
Options := Options or GAME_OPTION_TEAMDAMAGE;
- if gnRespawnItems then
- Options := Options or GAME_OPTION_RESPAWNITEMS;
if gnDeathmatchKeys then
Options := Options or GAME_OPTION_DMKEYS;
if gnAllowExit then
if GameType in [GT_CUSTOM, GT_SERVER] then
begin
TGUISwitch(menu.GetControl('swTeamDamage')).Enabled := True;
- TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := (GameMode in [GM_DM, GM_TDM, GM_CTF]);
+ if (GameMode in [GM_DM, GM_TDM, GM_CTF]) then
+ begin
+ TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := True;
+ TGUILabel(menu.GetControlsText('swDeathmatchKeys')).Color := MENU_ITEMSTEXT_COLOR;
+ end
+ else
+ begin
+ TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := False;
+ TGUILabel(menu.GetControlsText('swDeathmatchKeys')).Color := MENU_UNACTIVEITEMS_COLOR;
+ end;
TGUIEdit(menu.GetControl('edTimeLimit')).Enabled := True;
TGUILabel(menu.GetControlsText('edTimeLimit')).Color := MENU_ITEMSTEXT_COLOR;
TGUIEdit(menu.GetControl('edGoalLimit')).Enabled := True;
begin
TGUISwitch(menu.GetControl('swTeamDamage')).Enabled := True;
TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled := False;
+ TGUILabel(menu.GetControlsText('swDeathmatchKeys')).Color := MENU_UNACTIVEITEMS_COLOR;
with TGUIEdit(menu.GetControl('edTimeLimit')) do
begin
Enabled := False;
else
ItemIndex := 1;
end;
- with AddSwitch(_lc[I_MENU_RESPAWN_ITEMS]) do
- begin
- Name := 'swRespawnItems';
- AddItem(_lc[I_MENU_YES]);
- AddItem(_lc[I_MENU_NO]);
- if gnRespawnItems then
- ItemIndex := 0
- else
- ItemIndex := 1;
- end;
with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
begin
Name := 'swDeathmatchKeys';
else
ItemIndex := 1;
end;
- with AddSwitch(_lc[I_MENU_RESPAWN_ITEMS]) do
- begin
- Name := 'swRespawnItems';
- AddItem(_lc[I_MENU_YES]);
- AddItem(_lc[I_MENU_NO]);
- if gcRespawnItems then
- ItemIndex := 0
- else
- ItemIndex := 1;
- end;
with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
begin
Name := 'swDeathmatchKeys';