X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=9c548caf4f6ff14337465df3d362cec8ca043e83;hp=cf142396da91482d3332baf4611c7fdecc6b5364;hb=842d9be737f296941302d4dd727d95ded3aa2e16;hpb=e29288453fa69bd586c70120e148ff85e4b24df2

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index cf14239..9c548ca 100644
--- 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