diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index ba91ca3b28500d9f5a19ae442515c8bbe899eb1b..c56d6e821bd6d7224387c6ae68a434b4b0b2cce9 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
gMenuSmallFont: DWORD;
PromptIP: string;
PromptPort: Word;
+ TempScale: Integer = -1;
+ TempResScale: Integer = -1;
implementation
{$INCLUDE ../nogl/noGLuses.inc}
g_gui, g_textures, e_graphics, g_main, g_window, g_game, g_map,
g_basic, g_console, g_sound, g_gfx, g_player, g_options, g_weapons,
- e_log, SysUtils, CONFIG, g_playermodel, DateUtils, sdl2,
+ e_log, SysUtils, CONFIG, g_playermodel, DateUtils,
MAPDEF, Math, g_saveload,
- e_texture, g_language,
+ e_texture, g_language, e_res,
g_net, g_netmsg, g_netmaster, g_items, e_input, g_touch,
- utils, wadreader;
+ utils, wadreader, g_system;
type TYNCallback = procedure (yes:Boolean);
ovs := gVSync;
gVSync := TGUISwitch(menu.GetControl('swVSync')).ItemIndex = 0;
- if (ovs <> gVSync) then g_SetVSync(gVSync);
+ if (ovs <> gVSync) then
+ sys_EnableVSync(gVSync);
gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
- glLegacyNPOT := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
+ glNPOTOverride := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
+ gLerpActors := TGUISwitch(menu.GetControl('swInterp')).ItemIndex = 0;
menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
gShowMessages := TGUISwitch(menu.GetControl('swMessages')).ItemIndex = 0;
gRevertPlayers := TGUISwitch(menu.GetControl('swRevertPlayers')).ItemIndex = 0;
gChatBubble := TGUISwitch(menu.GetControl('swChatBubble')).ItemIndex;
- gPlayerIndicator := TGUISwitch(menu.GetControl('swPlayerIndicator')).ItemIndex = 0;
- g_dbg_scale := TGUIScroll(menu.GetControl('scScaleFactor')).Value + 1;
+ gPlayerIndicator := TGUISwitch(menu.GetControl('swPlayerIndicator')).ItemIndex;
+ gPlayerIndicatorStyle := TGUISwitch(menu.GetControl('swPlayerIndicatorStyle')).ItemIndex;
+ if TGUIScroll(menu.GetControl('scScaleFactor')).Value <> TempScale then
+ begin
+ TempScale := TGUIScroll(menu.GetControl('scScaleFactor')).Value;
+ g_dbg_scale := TempScale + 1;
+ end;
menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsMenu').GetControl('mOptionsControlsMenu'));
if g_Game_IsClient then MC_SEND_PlayerSettings;
- g_Options_Write(GameDir+'/'+CONFIG_FILENAME);
- g_Console_WriteGameConfig();
+ g_Console_WriteGameConfig;
end;
procedure ReadOptions();
if gVSync then ItemIndex := 0 else ItemIndex := 1;
with TGUISwitch(menu.GetControl('swLegacyNPOT')) do
- if not glLegacyNPOT then ItemIndex := 0 else ItemIndex := 1;
+ if not glNPOTOverride then ItemIndex := 0 else ItemIndex := 1;
+
+ with TGUISwitch(menu.GetControl('swInterp')) do
+ if gLerpActors then ItemIndex := 0 else ItemIndex := 1;
menu := TGUIMenu(g_GUI_GetWindow('OptionsSoundMenu').GetControl('mOptionsSoundMenu'));
ItemIndex := gChatBubble;
with TGUISwitch(menu.GetControl('swPlayerIndicator')) do
- if gPlayerIndicator then ItemIndex := 0 else ItemIndex := 1;
+ ItemIndex := gPlayerIndicator;
+
+ with TGUISwitch(menu.GetControl('swPlayerIndicatorStyle')) do
+ ItemIndex := gPlayerIndicatorStyle;
- TGUIScroll(menu.GetControl('scScaleFactor')).Value := Round(g_dbg_scale - 1);
+ TempScale := Round(g_dbg_scale - 1);
+ TGUIScroll(menu.GetControl('scScaleFactor')).Value := TempScale;
menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP1Menu').GetControl('mOptionsPlayersP1Menu'));
}
end;
-procedure ProcStartCustomGame();
+function LatchGameOptions(const MenuName: string): Byte;
var
- Map: String;
- GameMode: Byte;
- Options: LongWord;
+ Map: string;
begin
- with TGUIMenu(g_ActiveWindow.GetControl('mCustomGameMenu')) do
+ Result := GM_NONE;
+
+ with TGUIMenu(g_ActiveWindow.GetControl(MenuName)) do
begin
Map := TGUILabel(GetControl('lbMap')).Text;
if Map = '' then
if not isWadPath(Map) then
Exit;
- GameMode := TGUISwitch(GetControl('swGameMode')).ItemIndex+1;
- gcGameMode := TGUISwitch(GetControl('swGameMode')).GetText;
- gcTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
- gcGoalLimit := StrToIntDef(TGUIEdit(GetControl('edGoalLimit')).Text, 0);
- gcMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
-
- gcTeamDamage := TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0;
- gcAllowExit := TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0;
- gcWeaponStay := TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0;
- gcMonsters := TGUISwitch(GetControl('swMonsters')).ItemIndex = 0;
- Options := 0;
- if gcTeamDamage then
- Options := Options or GAME_OPTION_TEAMDAMAGE;
- if gcAllowExit then
- Options := Options or GAME_OPTION_ALLOWEXIT;
- if gcWeaponStay then
- Options := Options or GAME_OPTION_WEAPONSTAY;
- if gcMonsters then
- Options := Options or GAME_OPTION_MONSTERS;
- gcPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
+ Result := TGUISwitch(GetControl('swGameMode')).ItemIndex+1;
+ gsGameMode := TGUISwitch(GetControl('swGameMode')).GetText;
+ gsTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
+ gsGoalLimit := StrToIntDef(TGUIEdit(GetControl('edGoalLimit')).Text, 0);
+ gsMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
+ gsItemRespawnTime := StrToIntDef(TGUIEdit(GetControl('edItemRespawnTime')).Text, 0);
+ gsPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
+ gsMap := Map;
+
+ gsGameFlags := 0;
+ if TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_TEAMDAMAGE;
+ if TGUISwitch(GetControl('swDeathmatchKeys')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_DMKEYS;
+ if TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_ALLOWEXIT;
+ if TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_WEAPONSTAY;
+ if TGUISwitch(GetControl('swMonsters')).ItemIndex = 0 then
+ gsGameFlags := gsGameFlags or GAME_OPTION_MONSTERS;
case TGUISwitch(GetControl('swBotsVS')).ItemIndex of
- 1: begin
- Options := Options or GAME_OPTION_BOTVSMONSTER;
- gcBotsVS := 'Monsters';
- end;
- 2: begin
- Options := Options or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
- gcBotsVS := 'Everybody';
- end;
- else begin
- Options := Options or GAME_OPTION_BOTVSPLAYER;
- gcBotsVS := 'Players';
- end;
+ 1: gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSMONSTER;
+ 2: gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
+ else gsGameFlags := gsGameFlags or GAME_OPTION_BOTVSPLAYER;
end;
- gcMap := Map;
+ // TODO: get this crap out of here
+ gGameSettings.ItemRespawnTime := gsItemRespawnTime;
+ gGameSettings.WarmupTime := gsWarmupTime;
+ gGameSettings.SpawnInvul := gsSpawnInvul;
end;
+end;
- g_Options_Write_Gameplay_Custom(GameDir+'/'+CONFIG_FILENAME);
+procedure ProcStartCustomGame();
+var
+ GameMode: Byte;
+begin
+ GameMode := LatchGameOptions('mCustomGameMenu');
+ if GameMode = GM_NONE then Exit;
- g_Game_StartCustom(Map, GameMode, gcTimeLimit, gcGoalLimit,
- gcMaxLives, Options, gcPlayers);
+ g_Console_WriteGameConfig;
+ g_Game_StartCustom(gsMap, GameMode, gsTimeLimit, gsGoalLimit,
+ gsMaxLives, gsGameFlags, gsPlayers);
end;
procedure ProcStartNetGame();
var
- Map: String;
GameMode: Byte;
- Options: LongWord;
begin
+ GameMode := LatchGameOptions('mNetServerMenu');
+ if GameMode = GM_NONE then Exit;
+
with TGUIMenu(g_ActiveWindow.GetControl('mNetServerMenu')) do
begin
- Map := TGUILabel(GetControl('lbMap')).Text;
- if Map = '' then
- Exit;
- if not isWadPath(Map) then
- Exit;
-
- GameMode := TGUISwitch(GetControl('swGameMode')).ItemIndex+1;
- gnGameMode := TGUISwitch(GetControl('swGameMode')).GetText;
- gnTimeLimit := StrToIntDef(TGUIEdit(GetControl('edTimeLimit')).Text, 0);
- gnGoalLimit := StrToIntDef(TGUIEdit(GetControl('edGoalLimit')).Text, 0);
- gnMaxLives := StrToIntDef(TGUIEdit(GetControl('edMaxLives')).Text, 0);
NetPort := StrToIntDef(TGUIEdit(GetControl('edPort')).Text, 0);
-
- gnTeamDamage := TGUISwitch(GetControl('swTeamDamage')).ItemIndex = 0;
- gnAllowExit := TGUISwitch(GetControl('swEnableExits')).ItemIndex = 0;
- gnWeaponStay := TGUISwitch(GetControl('swWeaponStay')).ItemIndex = 0;
- gnMonsters := TGUISwitch(GetControl('swMonsters')).ItemIndex = 0;
- Options := 0;
- if gnTeamDamage then
- Options := Options or GAME_OPTION_TEAMDAMAGE;
- if gnAllowExit then
- Options := Options or GAME_OPTION_ALLOWEXIT;
- if gnWeaponStay then
- Options := Options or GAME_OPTION_WEAPONSTAY;
- if gnMonsters then
- Options := Options or GAME_OPTION_MONSTERS;
- gnPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex;
-
- case TGUISwitch(GetControl('swBotsVS')).ItemIndex of
- 1: begin
- Options := Options or GAME_OPTION_BOTVSMONSTER;
- gnBotsVS := 'Monsters';
- end;
- 2: begin
- Options := Options or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
- gnBotsVS := 'Everybody';
- end;
- else begin
- Options := Options or GAME_OPTION_BOTVSPLAYER;
- gnBotsVS := 'Players';
- end;
- end;
-
- gnMap := Map;
NetServerName := TGUIEdit(GetControl('edSrvName')).Text;
NetMaxClients := Max(1, StrToIntDef(TGUIEdit(GetControl('edMaxPlayers')).Text, 1));
NetMaxClients := Min(NET_MAXCLIENTS, NetMaxClients);
NetUseMaster := TGUISwitch(GetControl('swUseMaster')).ItemIndex = 0;
end;
- g_Options_Write_Net_Server(GameDir+'/'+CONFIG_FILENAME);
- g_Options_Write_Gameplay_Net(GameDir+'/'+CONFIG_FILENAME);
-
- g_Game_StartServer(Map, GameMode, gnTimeLimit, gnGoalLimit, gnMaxLives,
- Options, gnPlayers, 0, NetPort);
+ g_Console_WriteGameConfig;
+ g_Game_StartServer(gsMap, GameMode, gsTimeLimit, gsGoalLimit, gsMaxLives,
+ gsGameFlags, gsPlayers, 0, NetPort);
end;
procedure ProcConnectNetGame();
PW := TGUIEdit(GetControl('edPW')).Text;
end;
- g_Options_Write_Net_Client(GameDir+'/'+CONFIG_FILENAME);
+ g_Console_WriteGameConfig;
g_Game_StartClient(NetClientIP, NetClientPort, PW);
end;
PW := TGUIEdit(GetControl('edPW')).Text;
end;
- g_Options_Write_Net_Client(GameDir+'/'+CONFIG_FILENAME);
+ g_Console_WriteGameConfig;
g_Game_StartClient(NetClientIP, NetClientPort, PW);
end;
NetInitDone := True;
end;
- g_Net_Slist_Set(NetSlistIP, NetSlistPort);
+ g_Net_Slist_Set(NetMasterList);
gState := STATE_SLIST;
g_ActiveWindow := nil;
slWaitStr := _lc[I_NET_SLIST_WAIT];
g_Game_Draw;
- ReDrawWindow;
+ sys_Repaint;
slReturnPressed := True;
if g_Net_Slist_Fetch(slCurrent) then
begin
with TGUIMenu(g_ActiveWindow.GetControl('mCampaignMenu')) do
begin
- WAD := ExtractRelativePath(MapsDir, TGUIFileListBox(GetControl('lsWAD')).SelectedItem());
+ WAD := TGUIFileListBox(GetControl('lsWAD')).SelectedItem();
TwoPlayers := TGUISwitch(GetControl('swPlayers')).ItemIndex = 1;
end;
+ WAD := e_FindWadRel(MegawadDirs, WAD);
if TwoPlayers then
n := 2
begin
e_WriteLog('Loading menu data...', TMsgType.Notify);
+ g_Texture_CreateWADEx('MAINMENU_LOGO', GameWAD+':TEXTURES\MAINLOGO');
g_Texture_CreateWADEx('MAINMENU_MARKER1', GameWAD+':TEXTURES\MARKER1');
g_Texture_CreateWADEx('MAINMENU_MARKER2', GameWAD+':TEXTURES\MARKER2');
g_Texture_CreateWADEx('SCROLL_LEFT', GameWAD+':TEXTURES\SLEFT');
e_CharFont_Remove(gMenuFont);
e_CharFont_Remove(gMenuSmallFont);
+ g_Texture_Delete('MAINMENU_LOGO');
g_Texture_Delete('MAINMENU_MARKER1');
g_Texture_Delete('MAINMENU_MARKER2');
g_Texture_Delete('SCROLL_LEFT');
end;
end;
-procedure ProcSingle1Player();
+procedure ProcSinglePlayer (n: Integer);
+ var wad, map: AnsiString;
+begin
+ assert(n >= 1);
+ wad := g_ExtractWadName(gDefaultMegawadStart);
+ map := g_ExtractFilePathName(gDefaultMegawadStart);
+ if e_FindResource(AllMapDirs, wad) then
+ begin
+ wad := ExpandFileName(wad);
+ g_Game_StartSingle(wad + ':\' + map, n > 1, n)
+ end
+end;
+
+procedure ProcSingle1Player;
begin
- g_Game_StartSingle(gDefaultMegawadStart, False, 1);
+ ProcSinglePlayer(1)
end;
-procedure ProcSingle2Players();
+procedure ProcSingle2Players;
begin
- g_Game_StartSingle(gDefaultMegawadStart, True, 2);
+ ProcSinglePlayer(2)
end;
procedure ProcSelectMapMenu();
begin
with TGUIMenu(g_ActiveWindow.GetControl('mSelectMapMenu')) do
begin
- wad := ExtractRelativePath(MapsDir, TGUIFileListBox(GetControl('lsMapWAD')).SelectedItem());
+ wad := TGUIFileListBox(GetControl('lsMapWAD')).SelectedItem();
map := TGUIListBox(GetControl('lsMapRes')).SelectedItem();
end;
if (wad = '') or (map = '') then
Exit;
+ wad := e_FindWadRel(MapDirs, WAD);
+
res := wad+':\'+map;
TGUILabel(TGUIMenu(g_GUI_GetWindow('CustomGameMenu').GetControl('mCustomGameMenu')).GetControl('lbMap')).Text := res;
menu: TGUIMenu;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsGameMenu').GetControl('mOptionsGameMenu'));
- g_dbg_scale := TGUIScroll(menu.GetControl('scScaleFactor')).Value + 1;
+ if TGUIScroll(menu.GetControl('scScaleFactor')).Value <> TempScale then
+ begin
+ TempScale := TGUIScroll(menu.GetControl('scScaleFactor')).Value;
+ g_dbg_scale := TempScale + 1;
+ end;
end;
procedure ProcChangeTouchSettings(Sender: TGUIControl);
if yes then gExit := EXIT_SIMPLE else g_GUI_HideWindow;
end;
-procedure ProcSetRussianLanguage();
+procedure ProcSetRussianLanguage;
begin
if gLanguage <> LANGUAGE_RUSSIAN then
begin
gLanguage := LANGUAGE_RUSSIAN;
gLanguageChange := True;
gAskLanguage := False;
-
- g_Options_Write_Language(GameDir+'/'+CONFIG_FILENAME);
-
- // Ñîõðàíÿåì èçìåíåíèÿ âñåõ íàñòðîåê:
ProcApplyOptions();
end;
end;
-procedure ProcSetEnglishLanguage();
+procedure ProcSetEnglishLanguage;
begin
if gLanguage <> LANGUAGE_ENGLISH then
begin
gLanguage := LANGUAGE_ENGLISH;
gLanguageChange := True;
gAskLanguage := False;
-
- g_Options_Write_Language(GameDir+'/'+CONFIG_FILENAME);
-
- // Ñîõðàíÿåì èçìåíåíèÿ âñåõ íàñòðîåê:
ProcApplyOptions();
end;
end;
ItemIndex := 0
else
ItemIndex := 1;
+ with TGUISwitch(menu.GetControl('swDeathmatchKeys')) do
+ if LongBool(Options and GAME_OPTION_DMKEYS) then
+ ItemIndex := 0
+ else
+ ItemIndex := 1;
TGUIEdit(menu.GetControl('edTimeLimit')).Text := IntToStr(TimeLimit);
TGUIEdit(menu.GetControl('edGoalLimit')).Text := IntToStr(GoalLimit);
if GameType in [GT_CUSTOM, GT_SERVER] then
begin
TGUISwitch(menu.GetControl('swTeamDamage')).Enabled := True;
+ 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;
else
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;
Options := Options and (not GAME_OPTION_TEAMDAMAGE);
end;
+ if TGUISwitch(menu.GetControl('swDeathmatchKeys')).Enabled then
+ begin
+ if TGUISwitch(menu.GetControl('swDeathmatchKeys')).ItemIndex = 0 then
+ Options := Options or GAME_OPTION_DMKEYS
+ else
+ Options := Options and (not GAME_OPTION_DMKEYS);
+ end;
+
if TGUIEdit(menu.GetControl('edTimeLimit')).Enabled then
begin
n := StrToIntDef(TGUIEdit(menu.GetControl('edTimeLimit')).Text, TimeLimit);
end;
end;
end;
+
+ // don't forget to latch this shit
+ gsGameFlags := Options;
+ gsMaxLives := MaxLives;
+ gsGoalLimit := GoalLimit;
+ gsTimeLimit := TimeLimit;
end;
if g_Game_IsNet then MH_SEND_GameSettings;
var
menu: TGUIMenu;
list: SSArray;
- SR: DWORD;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
TGUILabel(menu.GetControl('lbCurrentRes')).Text :=
- IntToStr(gScreenWidth) +
- ' x ' + IntToStr(gScreenHeight) +
+ IntToStr(gWinSizeX) +
+ ' x ' + IntToStr(gWinSizeY) +
', ' + IntToStr(gBPP) + ' bpp';
with TGUIListBox(menu.GetControl('lsResolution')) do
begin
- list := GetDisplayModes(gBPP, SR);
-
+ list := sys_GetDisplayModes(gBPP);
if list <> nil then
- begin
- Items := list;
- ItemIndex := SR;
- end
+ begin
+ Items := list;
+ ItemIndex := Length(list)
+ end
else
- Clear();
+ begin
+ Clear
+ end
end;
with TGUISwitch(menu.GetControl('swFullScreen')) do
ItemIndex := 0
else
ItemIndex := 1;
+
+ TempResScale := Round(r_pixel_scale - 1);
+ TGUIScroll(menu.GetControl('scResFactor')).Value := TempResScale;
end;
procedure ProcApplyVideoOptions();
menu: TGUIMenu;
Fullscreen: Boolean;
SWidth, SHeight: Integer;
+ ScaleChanged: Boolean;
str: String;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoResMenu').GetControl('mOptionsVideoResMenu'));
str := TGUIListBox(menu.GetControl('lsResolution')).SelectedItem;
- SScanf(str, '%dx%d', [@SWidth, @SHeight]);
+ if str <> '' then
+ SScanf(str, '%dx%d', [@SWidth, @SHeight])
+ else
+ begin
+ SWidth := gWinSizeX;
+ SHeight := gWinSizeY;
+ end;
Fullscreen := TGUISwitch(menu.GetControl('swFullScreen')).ItemIndex = 0;
- if (SWidth <> gScreenWidth) or
- (SHeight <> gScreenHeight) or
- (Fullscreen <> gFullscreen) then
+ ScaleChanged := False;
+ if TGUIScroll(menu.GetControl('scResFactor')).Value <> TempResScale then
+ begin
+ TempResScale := TGUIScroll(menu.GetControl('scResFactor')).Value;
+ r_pixel_scale := TempResScale + 1;
+ ScaleChanged := True;
+ end;
+
+ if (SWidth <> gWinSizeX) or
+ (SHeight <> gWinSizeY) or
+ (Fullscreen <> gFullscreen) or
+ ScaleChanged then
begin
gResolutionChange := True;
gRC_Width := SWidth;
ProcApplyOptions();
end;
-procedure ProcSetFirstRussianLanguage();
+procedure ProcSetFirstRussianLanguage;
begin
gLanguage := LANGUAGE_RUSSIAN;
gLanguageChange := True;
gAskLanguage := False;
-
- g_Options_Write_Language(GameDir+'/'+CONFIG_FILENAME);
end;
-procedure ProcSetFirstEnglishLanguage();
+procedure ProcSetFirstEnglishLanguage;
begin
gLanguage := LANGUAGE_ENGLISH;
gLanguageChange := True;
gAskLanguage := False;
-
- g_Options_Write_Language(GameDir+'/'+CONFIG_FILENAME);
end;
procedure ProcRecallAddress();
begin
Menu := TGUIWindow.Create('FirstLanguageMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, ' '))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', ' '))) do
begin
Name := 'mmFirstLanguageMenu';
AddButton(@ProcSetFirstRussianLanguage, 'Ðóññêèé', '');
//list: SSArray;
begin
Menu := TGUIWindow.Create('MainMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, 'MAINMENU_LOGO', _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmMainMenu';
AddButton(nil, _lc[I_MENU_NEW_GAME], 'NewGameMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('NewGameMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, _lc[I_MENU_NEW_GAME]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_NEW_GAME]))) do
begin
Name := 'mmNewGameMenu';
AddButton(@ProcSingle1Player, _lc[I_MENU_1_PLAYER]);
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('NetGameMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, _lc[I_MENU_MULTIPLAYER]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MULTIPLAYER]))) do
begin
Name := 'mmNetGameMenu';
AddButton(@ProcRecallAddress, _lc[I_MENU_START_CLIENT], 'NetClientMenu');
begin
Name := 'lbMap';
FixedLength := 16;
- Text := gnMap;
+ Text := gsMap;
OnClick := @ProcSelectMapMenu;
end;
with AddSwitch(_lc[I_MENU_GAME_TYPE]) do
AddItem(_lc[I_MENU_GAME_TYPE_TDM]);
AddItem(_lc[I_MENU_GAME_TYPE_CTF]);
AddItem(_lc[I_MENU_GAME_TYPE_COOP]);
- case g_Game_TextToMode(gnGameMode) of
+ case g_Game_TextToMode(gsGameMode) of
GM_NONE,
GM_DM: ItemIndex := 0;
GM_TDM: ItemIndex := 1;
GM_SINGLE,
GM_COOP: ItemIndex := 3;
end;
- OnChange := ProcSwitchMonstersNet;
+ OnChange := ProcSwitchMonstersCustom;
end;
with AddEdit(_lc[I_MENU_TIME_LIMIT]) do
begin
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gnTimeLimit > 0 then
- Text := IntToStr(gnTimeLimit);
+ if gsTimeLimit > 0 then
+ Text := IntToStr(gsTimeLimit);
end;
with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
begin
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gnGoalLimit > 0 then
- Text := IntToStr(gnGoalLimit);
+ if gsGoalLimit > 0 then
+ Text := IntToStr(gsGoalLimit);
end;
with AddEdit(_lc[I_MENU_MAX_LIVES]) do
begin
Name := 'edMaxLives';
OnlyDigits := True;
Width := 4;
- MaxLength := 3;
- if gnMaxLives > 0 then
- Text := IntToStr(gnMaxLives);
+ MaxLength := 5;
+ if gsMaxLives > 0 then
+ Text := IntToStr(gsMaxLives);
end;
- with AddSwitch(_lc[I_MENU_SERVER_PLAYERS]) do
+ with AddEdit(_lc[I_MENU_ITEM_RESPAWN_TIME]) do
+ begin
+ Name := 'edItemRespawnTime';
+ OnlyDigits := True;
+ Width := 4;
+ MaxLength := 5;
+ if gsItemRespawnTime > 0 then
+ Text := IntToStr(gsItemRespawnTime);
+ end;
+ with AddSwitch(_lc[I_MENU_PLAYERS]) do
begin
Name := 'swPlayers';
AddItem(_lc[I_MENU_COUNT_NONE]);
AddItem(_lc[I_MENU_PLAYERS_ONE]);
AddItem(_lc[I_MENU_PLAYERS_TWO]);
- ItemIndex := gnPlayers;
+ ItemIndex := gsPlayers;
end;
with AddSwitch(_lc[I_MENU_TEAM_DAMAGE]) do
begin
Name := 'swTeamDamage';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gnTeamDamage then
+ if LongBool(gsGameFlags and GAME_OPTION_TEAMDAMAGE) then
+ ItemIndex := 0
+ else
+ ItemIndex := 1;
+ end;
+ with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
+ begin
+ Name := 'swDeathmatchKeys';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ if LongBool(gsGameFlags and GAME_OPTION_DMKEYS) then
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swEnableExits';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gnAllowExit then
+ if LongBool(gsGameFlags and GAME_OPTION_ALLOWEXIT) then
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swWeaponStay';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gnWeaponStay then
+ if LongBool(gsGameFlags and GAME_OPTION_WEAPONSTAY) then
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swMonsters';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gnMonsters then
+ if LongBool(gsGameFlags and GAME_OPTION_MONSTERS) then
ItemIndex := 0
else
ItemIndex := 1;
AddItem(_lc[I_MENU_BOTS_VS_MONSTERS]);
AddItem(_lc[I_MENU_BOTS_VS_ALL]);
ItemIndex := 2;
- if gnBotsVS = 'Players' then
+ if not LongBool(gsGameFlags and GAME_OPTION_BOTVSMONSTER) then
ItemIndex := 0;
- if gnBotsVS = 'Monsters' then
+ if not LongBool(gsGameFlags and GAME_OPTION_BOTVSPLAYER) then
ItemIndex := 1;
end;
AddSpace();
begin
Name := 'lbMap';
FixedLength := 16;
- Text := gcMap;
+ Text := gsMap;
OnClick := @ProcSelectMapMenu;
end;
with AddSwitch(_lc[I_MENU_GAME_TYPE]) do
AddItem(_lc[I_MENU_GAME_TYPE_TDM]);
AddItem(_lc[I_MENU_GAME_TYPE_CTF]);
AddItem(_lc[I_MENU_GAME_TYPE_COOP]);
- case g_Game_TextToMode(gcGameMode) of
+ case g_Game_TextToMode(gsGameMode) of
GM_NONE,
GM_DM: ItemIndex := 0;
GM_TDM: ItemIndex := 1;
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gcTimeLimit > 0 then
- Text := IntToStr(gcTimeLimit);
+ if gsTimeLimit > 0 then
+ Text := IntToStr(gsTimeLimit);
end;
with AddEdit(_lc[I_MENU_GOAL_LIMIT]) do
begin
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gcGoalLimit > 0 then
- Text := IntToStr(gcGoalLimit);
+ if gsGoalLimit > 0 then
+ Text := IntToStr(gsGoalLimit);
end;
with AddEdit(_lc[I_MENU_MAX_LIVES]) do
begin
OnlyDigits := True;
Width := 4;
MaxLength := 5;
- if gcMaxLives > 0 then
- Text := IntToStr(gcMaxLives);
+ if gsMaxLives > 0 then
+ Text := IntToStr(gsMaxLives);
+ end;
+ with AddEdit(_lc[I_MENU_ITEM_RESPAWN_TIME]) do
+ begin
+ Name := 'edItemRespawnTime';
+ OnlyDigits := True;
+ Width := 4;
+ MaxLength := 5;
+ if gsItemRespawnTime > 0 then
+ Text := IntToStr(gsItemRespawnTime);
end;
with AddSwitch(_lc[I_MENU_PLAYERS]) do
begin
AddItem(_lc[I_MENU_COUNT_NONE]);
AddItem(_lc[I_MENU_PLAYERS_ONE]);
AddItem(_lc[I_MENU_PLAYERS_TWO]);
- ItemIndex := gcPlayers;
+ ItemIndex := gsPlayers;
end;
with AddSwitch(_lc[I_MENU_TEAM_DAMAGE]) do
begin
Name := 'swTeamDamage';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gcTeamDamage then
+ if LongBool(gsGameFlags and GAME_OPTION_TEAMDAMAGE) then
+ ItemIndex := 0
+ else
+ ItemIndex := 1;
+ end;
+ with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
+ begin
+ Name := 'swDeathmatchKeys';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ if LongBool(gsGameFlags and GAME_OPTION_DMKEYS) then
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swEnableExits';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gcAllowExit then
+ if LongBool(gsGameFlags and GAME_OPTION_ALLOWEXIT) then
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swWeaponStay';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gcWeaponStay then
+ if LongBool(gsGameFlags and GAME_OPTION_WEAPONSTAY) then
ItemIndex := 0
else
ItemIndex := 1;
Name := 'swMonsters';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
- if gcMonsters then
+ if LongBool(gsGameFlags and GAME_OPTION_MONSTERS) then
ItemIndex := 0
else
ItemIndex := 1;
AddItem(_lc[I_MENU_BOTS_VS_MONSTERS]);
AddItem(_lc[I_MENU_BOTS_VS_ALL]);
ItemIndex := 2;
- if gcBotsVS = 'Players' then
+ if not LongBool(gsGameFlags and GAME_OPTION_BOTVSMONSTER) then
ItemIndex := 0;
- if gcBotsVS = 'Monsters' then
+ if not LongBool(gsGameFlags and GAME_OPTION_BOTVSPLAYER) then
ItemIndex := 1;
end;
AddSpace();
Sort := True;
Dirs := True;
FileMask := '*.wad|*.pk3|*.zip|*.dfz';
- SetBase(MapsDir+'megawads/');
+ SetBase(MegawadDirs);
end;
with AddLabel(_lc[I_MENU_MAP_NAME]) do
Sort := True;
Dirs := True;
FileMask := '*.wad|*.pk3|*.zip|*.dfz';
- SetBase(MapsDir);
+ SetBase(MapDirs);
end;
with AddList(_lc[I_MENU_MAP_RESOURCE], 12, 4) do
begin
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('OptionsMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, _lc[I_MENU_OPTIONS]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_OPTIONS]))) do
begin
Name := 'mmOptionsMenu';
AddButton(nil, _lc[I_MENU_VIDEO_OPTIONS], 'OptionsVideoMenu');
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
+ with AddSwitch(_lc[I_MENU_VIDEO_INTERPOLATION]) do
+ begin
+ Name := 'swInterp';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ end;
with AddSwitch(_lc[I_MENU_VIDEO_LEGACY_COMPATIBLE]) do
begin
Name := 'swLegacyNPOT';
AddItem(_lc[I_MENU_YES]);
AddItem(_lc[I_MENU_NO]);
end;
+ with AddScroll(_lc[I_MENU_GAME_SCALE_FACTOR]) do
+ begin
+ Name := 'scResFactor';
+ Max := 10;
+ end;
AddSpace();
AddButton(@ProcApplyVideoOptions, _lc[I_MENU_RESOLUTION_APPLY]);
UpdateIndex();
with AddSwitch(_lc[I_MENU_GAME_PLAYER_INDICATOR]) do
begin
Name := 'swPlayerIndicator';
- AddItem(_lc[I_MENU_YES]);
- AddItem(_lc[I_MENU_NO]);
+ AddItem(_lc[I_MENU_GAME_INDICATOR_NONE]);
+ AddItem(_lc[I_MENU_GAME_INDICATOR_OWN]);
+ AddItem(_lc[I_MENU_GAME_INDICATOR_ALL]);
+ end;
+ with AddSwitch(_lc[I_MENU_GAME_INDICATOR_STYLE]) do
+ begin
+ Name := 'swPlayerIndicatorStyle';
+ AddItem(_lc[I_MENU_GAME_INDICATOR_ARROW]);
+ AddItem(_lc[I_MENU_GAME_INDICATOR_NAME]);
end;
with AddScroll(_lc[I_MENU_GAME_SCALE_FACTOR]) do
begin
begin
Name := 'mOptionsControlsJoystickMenu';
for i := 0 to e_MaxJoys - 1 do
- if e_JoystickAvailable[i] then
- with AddScroll(Format(_lc[I_MENU_CONTROL_DEADZONE], [i + 1])) do
- begin
- Name := 'scDeadzone' + IntToStr(i);
- Max := 20
- end
+ with AddScroll(Format(_lc[I_MENU_CONTROL_DEADZONE], [i + 1])) do
+ begin
+ Name := 'scDeadzone' + IntToStr(i);
+ Max := 20
+ end
end;
Menu.DefControl := 'mOptionsControlsJoystickMenu';
g_GUI_AddWindow(Menu);
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameSingleMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameSingleMenu';
AddButton(nil, _lc[I_MENU_LOAD_GAME], 'LoadMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameCustomMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameCustomMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameServerMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameServerMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('GameClientMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, _lc[I_MENU_MAIN_MENU]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_MAIN_MENU]))) do
begin
Name := 'mmGameClientMenu';
AddButton(nil, _lc[I_MENU_CHANGE_PLAYERS], 'TeamMenu');
AddItem(_lc[I_MENU_NO]);
ItemIndex := 1;
end;
+ with AddSwitch(_lc[I_MENU_DEATHMATCH_KEYS]) do
+ begin
+ Name := 'swDeathmatchKeys';
+ AddItem(_lc[I_MENU_YES]);
+ AddItem(_lc[I_MENU_NO]);
+ ItemIndex := 1;
+ end;
with AddEdit(_lc[I_MENU_TIME_LIMIT]) do
begin
Name := 'edTimeLimit';
g_GUI_AddWindow(Menu);
Menu := TGUIWindow.Create('TeamMenu');
- with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, _lc[I_MENU_CHANGE_PLAYERS]))) do
+ with TGUIMainMenu(Menu.AddChild(TGUIMainMenu.Create(gMenuFont, '', _lc[I_MENU_CHANGE_PLAYERS]))) do
begin
Name := 'mmTeamMenu';
AddButton(@ProcJoinRed, _lc[I_MENU_JOIN_RED], '').Name := 'tmJoinRed';