system: remove direct videomode change

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index cf142396da91482d3332baf4611c7fdecc6b5364..9c548caf4f6ff14337465df3d362cec8ca043e83 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -87,7 +87,6 @@ procedure g_Game_Update();
 procedure g_Game_PreUpdate();
 procedure g_Game_Quit();
 procedure g_Game_SetupScreenSize();
-procedure g_Game_ChangeResolution(newWidth, newHeight: Word; nowFull, nowMax: Boolean);
 function  g_Game_ModeToText(Mode: Byte): string;
 function  g_Game_TextToMode(Mode: string): Byte;
 procedure g_Game_ExecuteEvent(Name: String);
@@ -440,7 +439,7 @@ uses
 {$IFDEF ENABLE_HOLMES}
   g_holmes,
 {$ENDIF}
-  e_res, g_textures, g_window, g_menu,
+  e_res, g_textures, g_window, g_menu, r_render,
   e_input, e_log, g_console, r_console, g_items, g_map, g_panel,
   g_playermodel, g_gfx, g_options, Math,
   g_triggers, g_monsters, e_sound, CONFIG,
@@ -2334,7 +2333,7 @@ begin
     if gResolutionChange then
     begin
       e_WriteLog('Changing resolution', TMsgType.Notify);
-      g_Game_ChangeResolution(gRC_Width, gRC_Height, gRC_FullScreen, gRC_Maximized);
+      r_Render_Apply;
       gResolutionChange := False;
       g_ActiveWindow := nil;
     end;
@@ -2782,11 +2781,6 @@ begin
   end;
 end;
 
-procedure g_Game_ChangeResolution(newWidth, newHeight: Word; nowFull, nowMax: Boolean);
-begin
-  sys_SetDisplayMode(newWidth, newHeight, gBPP, nowFull, nowMax);
-end;
-
 procedure g_Game_AddPlayer(Team: Byte = TEAM_NONE);
 begin
   if ((not gGameOn) and (gState <> STATE_INTERCUSTOM))
@@ -5928,16 +5922,7 @@ begin
         g_Game_Quit();
       end;
     'r_reset':
-      begin
-        gRC_Width := Max(1, gRC_Width);
-        gRC_Height := Max(1, gRC_Height);
-        gBPP := Max(1, gBPP);
-        if sys_SetDisplayMode(gRC_Width, gRC_Height, gBPP, gRC_FullScreen, gRC_Maximized) = True then
-          e_LogWriteln('resolution changed')
-        else
-          e_LogWriteln('resolution not changed');
-        sys_EnableVSync(gVSync);
-      end;
+       r_Render_Apply;
     'r_maxfps':
       begin
         if Length(p) = 2 then

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index c4d9b38b19b31af46dcc521461e232675f1ac8a2..bca5dbed9f2efa8a557964db5a7702d3662e560c 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -107,7 +107,6 @@ procedure ProcApplyOptions();
 var
   menu: TGUIMenu;
   i: Integer;
-  ovs: Boolean;
 begin
   menu := TGUIMenu(g_GUI_GetWindow('OptionsVideoMenu').GetControl('mOptionsVideoMenu'));
 
@@ -116,10 +115,7 @@ begin
   else
     gBPP := 32;
 
-  ovs := gVSync;
   gVSync := TGUISwitch(menu.GetControl('swVSync')).ItemIndex = 0;
-  if (ovs <> gVSync) then
-    sys_EnableVSync(gVSync);
 
   gTextureFilter := TGUISwitch(menu.GetControl('swTextureFilter')).ItemIndex = 0;
   glNPOTOverride := not (TGUISwitch(menu.GetControl('swLegacyNPOT')).ItemIndex = 0);

diff --git a/src/game/opengl/r_render.pas b/src/game/opengl/r_render.pas
index 483bd53282af43d03cbeb2e5f53331f2404ebb1b..bea15e65fd69381263c4714dbef9e9fab47d2719 100644 (file)
--- a/src/game/opengl/r_render.pas
+++ b/src/game/opengl/r_render.pas
@@ -21,13 +21,16 @@ interface
   procedure r_Render_Finalize;
   procedure r_Render_Resize (w, h: Integer);
 
+  procedure r_Render_Apply;
+
 implementation
 
   uses
     {$INCLUDE ../../nogl/noGLuses.inc}
-    SysUtils, Classes,
+    SysUtils, Classes, Math,
     e_log, g_system,
-    g_game, g_options, r_window, r_graphics, r_console, r_playermodel
+    g_game, g_options, g_console,
+    r_window, r_graphics, r_console, r_playermodel
   ;
 
   var
@@ -109,4 +112,13 @@ implementation
     e_InitGL
   end;
 
+  procedure r_Render_Apply;
+  begin
+    if sys_SetDisplayMode(Max(1, gRC_Width), Max(1, gRC_Height), Max(1, gBPP), gRC_FullScreen, gRC_Maximized) then
+      e_LogWriteln('resolution changed')
+    else
+      e_LogWriteln('resolution not changed');
+    sys_EnableVSync(gVSync)
+  end;
+
 end.