render: remove from render some common types

[d2df-sdl.git] / src / game / g_window.pas

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index d3850c8e666e10422bfc13eeeb1a587be1c76b0c..7a719b606d8b8446ef07f255519aa292bf126f67 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -25,7 +25,6 @@ procedure ResetTimer ();
 procedure ProcessLoading (forceUpdate: Boolean = False);
 
 var
-  gwin_dump_extensions: Boolean = false;
   gwin_has_stencil: Boolean = false;
   gwin_k8_enable_light_experiments: Boolean = false;
   g_dbg_aimline_on: Boolean = false;
@@ -40,8 +39,8 @@ uses
 {$ENDIF}
 {$INCLUDE ../nogl/noGLuses.inc}
   SysUtils, Classes, MAPDEF, Math,
-  e_graphics, e_log, e_texture, g_main,
-  g_console, e_input, g_options, g_game,
+  r_graphics, e_log, e_texture, g_main,
+  g_console, r_console, e_input, g_options, g_game, r_game,
   g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
   g_map, g_gfx, g_monsters, xprofiler,
   g_touch, g_gui, g_system, g_netmaster;
@@ -91,10 +90,10 @@ begin
       e_SetRendertarget(True);
       e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
 
-      DrawMenuBackground('INTER');
+      r_Game_DrawMenuBackground('INTER');
       e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-      DrawLoadingStat();
-      g_Console_Draw(True);
+      r_Game_DrawLoadingStat();
+      r_Console_Draw(True);
 
       e_SetRendertarget(False);
       e_SetViewPort(0, 0, gWinSizeX, gWinSizeY);
@@ -256,8 +255,6 @@ begin
   begin
     arg := ParamStr(idx);
     Inc(idx);
-    if arg = '--opengl-dump-exts' then gwin_dump_extensions := true;
-    //if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
     if arg = '--jah' then g_profile_history_size := 100;
     if arg = '--no-particles' then gpart_dbg_enabled := false;
     if arg = '--no-los' then gmon_dbg_los_enabled := false;
@@ -360,7 +357,6 @@ begin
     if (glLegacyNPOT) then e_logWriteln('NPOT texture emulation: enabled')
     else e_logWriteln('NPOT texture emulation: disabled');
   end;
-  gwin_dump_extensions := false;
 
   Init;
   Time_Old := sys_GetTicks();