render: remove references to r_playermodel/r_game from game code

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 4a74e6614da75779ca42cffceae0af86c9c646d8..c56af24696221e14e974b32deaae5d8a55b6b439 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -301,7 +301,7 @@ begin
     else
       gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
 {$IFNDEF HEADLESS}
-    r_Game_Draw;
+    r_Render_Draw;
     sys_Repaint;
 {$ENDIF}
     Frame := Time

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 0123ecd695f4fbcd8769477f23d9c9529a1125ed..23bf9bdc49cfa87e47d2093907cd62ab78a84abe 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -446,7 +446,7 @@ uses
     g_holmes,
   {$ENDIF}
   {$IFNDEF HEADLESS}
-    r_render, g_menu, r_playermodel, g_system,
+    r_render, g_menu, g_system,
   {$ENDIF}
   e_res, g_window,
   e_input, e_log, g_console, g_items, g_map, g_panel,

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 0f0f2509cb54e7a492867e6afff9f90f021d3d37..cb5ea3cabb527cf74084aaf9511b0ec07bc9e79f 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -49,7 +49,7 @@ uses
   MAPDEF, Math, g_saveload,
   g_language, e_res,
   g_net, g_netmsg, g_netmaster, g_items, e_input, g_touch,
-  utils, wadreader, g_system, r_game;
+  utils, wadreader, g_system, r_render;
 
 
 type TYNCallback = procedure (yes:Boolean);
@@ -780,7 +780,7 @@ begin
 
   slWaitStr := _lc[I_NET_SLIST_WAIT];
 
-  r_Game_Draw;
+  r_Render_Draw;
   sys_Repaint;
 
   slReturnPressed := True;

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index ae0b0de1e796fc2be6bcfb77c2ab7953b7ac8514..7ae9c4c10e311d06f95a32fb1e68da8bab7d238a 100644 (file)
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -177,7 +177,7 @@ implementation
 
 uses
   {$IFNDEF HEADLESS}
-    g_gui, g_menu, r_game, g_system,
+    g_gui, g_menu, r_render, g_system,
   {$ENDIF}
   e_input, e_log, g_net, g_console,
   g_map, g_game, g_sound, g_options, g_language, g_basic,
@@ -1784,7 +1784,7 @@ begin
       slWaitStr := _lc[I_NET_SLIST_WAIT];
 
 {$IFNDEF HEADLESS}
-      r_Game_Draw;
+      r_Render_Draw;
       sys_Repaint;
 {$ENDIF}
 

diff --git a/src/game/opengl/r_render.pas b/src/game/opengl/r_render.pas
index 1a35098c0216ed5f3575dc7cc90bf15b4f3bc29f..2eba7b282439ec1dff864cc11afedfd423ab8311 100644 (file)
--- a/src/game/opengl/r_render.pas
+++ b/src/game/opengl/r_render.pas
@@ -29,6 +29,7 @@ interface
   procedure r_Render_FreeTextures;
 
   procedure r_Render_Update;
+  procedure r_Render_Draw;
 
   procedure r_Render_Resize (w, h: Integer);
   procedure r_Render_Apply;
@@ -152,6 +153,11 @@ implementation
     r_Console_Update;
   end;
 
+  procedure r_Render_Draw;
+  begin
+    r_Game_Draw;
+  end;
+
   procedure r_Render_Resize (w, h: Integer);
   begin
     LoadGL;