X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fopengl%2Fr_render.pas;h=869b27ff25f9b645d5e5c0a43e506c9aa2ea2dca;hb=57eea56cadbee2ab1e505f50144d1e1671deaa30;hp=253ff7de93177bb0bab72d0665fe21a4e951ba23;hpb=16342bee09fa001d05697571124e48a93cd35f2c;p=d2df-sdl.git diff --git a/src/game/opengl/r_render.pas b/src/game/opengl/r_render.pas index 253ff7d..869b27f 100644 --- a/src/game/opengl/r_render.pas +++ b/src/game/opengl/r_render.pas @@ -61,8 +61,14 @@ implementation {$IFDEF ENABLE_GFX} r_gfx, {$ENDIF} + {$IFDEF ENABLE_SYSTEM} + g_system, + {$ENDIF} + {$IFDEF ENABLE_MENU} + r_gui, + {$ENDIF} SysUtils, Classes, Math, - e_log, g_system, utils, + e_log, utils, g_game, g_options, g_console, r_window, r_graphics, r_console, r_playermodel, r_textures, r_animations, r_weapons, r_items, r_monsters, r_map, r_player, r_game @@ -217,10 +223,16 @@ implementation {$IFDEF ENABLE_GFX} r_GFX_Load; {$ENDIF} + {$IFDEF ENABLE_MENU} + r_GUI_Load; + {$ENDIF} end; procedure r_Render_Free; begin + {$IFDEF ENABLE_MENU} + r_GUI_Free; + {$ENDIF} {$IFDEF ENABLE_GFX} r_GFX_Free; {$ENDIF} @@ -237,8 +249,10 @@ implementation procedure r_Render_Initialize; begin - if sys_SetDisplayMode(gRC_Width, gRC_Height, gBPP, gRC_FullScreen, gRC_Maximized) = False then - raise Exception.Create('Failed to set videomode on startup.'); + {$IFDEF ENABLE_SYSTEM} + if sys_SetDisplayMode(gRC_Width, gRC_Height, gBPP, gRC_FullScreen, gRC_Maximized) = False then + raise Exception.Create('Failed to set videomode on startup.'); + {$ENDIF} LoadGL; r_Window_Initialize; r_Console_Init; @@ -301,11 +315,13 @@ implementation 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) + {$IFDEF ENABLE_SYSTEM} + 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) + {$ENDIF} end; function r_Render_WriteScreenShot (filename: String): Boolean;