diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index ff57a392880a97a2b1bdb2514b6272240288b007..3056950af666495842af15a008ba3f4cc2ac211c 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
implementation
uses
+{$IFDEF USE_NANOGL}
+ nanoGL,
+{$ELSE}
+ GL, GLExt,
+{$ENDIF}
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,
MAPDEF, Math, g_saveload,
- e_texture, GL, GLExt, g_language,
+ e_texture, g_language,
g_net, g_netmsg, g_netmaster, g_items, e_input,
utils, wadreader;
menu: TGUIMenu;
i: Integer;
ovs: Boolean;
- v: Byte;
begin
menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
ovs := gVSync;
gVSync := TGUISwitch(menu.GetControl('swVSync')).ItemIndex = 0;
- {$IF not DEFINED(HEADLESS)}
- if (ovs <> gVSync) then
- begin
- if (gVSync) then v := 1 else v := 0;
- if (SDL_GL_SetSwapInterval(v) <> 0) then writeln('oops; can''t change vsync option, restart required')
- else writeln('vsync changed');
- end;
- {$ENDIF}
+ if (ovs <> gVSync) then g_SetVSync(gVSync);
gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
glLegacyNPOT := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);
gShowMessages := TGUISwitch(menu.GetControl('swMessages')).ItemIndex = 0;
gRevertPlayers := TGUISwitch(menu.GetControl('swRevertPlayers')).ItemIndex = 0;
gChatBubble := TGUISwitch(menu.GetControl('swChatBubble')).ItemIndex;
+ g_dbg_scale := TGUIScroll(menu.GetControl('swScaleFactor')).Value + 1;
menu := TGUIMenu(g_GUI_GetWindow('OptionsControlsMenu').GetControl('mOptionsControlsMenu'));
with TGUISwitch(menu.GetControl('swChatBubble')) do
ItemIndex := gChatBubble;
+ TGUIScroll(menu.GetControl('swScaleFactor')).Value := Round(g_dbg_scale - 1);
+
menu := TGUIMenu(g_GUI_GetWindow('OptionsPlayersP1Menu').GetControl('mOptionsPlayersP1Menu'));
TGUIListBox(menu.GetControl('lsP1Model')).SelectItem(gPlayer1Settings.Model);
);
end;
+procedure ProcChangeGameSettings(Sender: TGUIControl);
+var
+ menu: TGUIMenu;
+begin
+ menu := TGUIMenu(g_GUI_GetWindow('OptionsGameMenu').GetControl('mOptionsGameMenu'));
+ g_dbg_scale := TGUIScroll(menu.GetControl('swScaleFactor')).Value + 1;
+end;
+
procedure ProcOptionsPlayersMIMenu();
var
s, a: string;
AddItem(_lc[I_MENU_GAME_CHAT_TYPE_COLOR]);
AddItem(_lc[I_MENU_GAME_CHAT_TYPE_TEXTURE]);
end;
+ with AddScroll(_lc[I_MENU_GAME_SCALE_FACTOR]) do
+ begin
+ Name := 'swScaleFactor';
+ Max := 10;
+ OnChange := ProcChangeGameSettings;
+ end;
ReAlign();
end;
Menu.DefControl := 'mOptionsGameMenu';