render: remove references to r_playermodel/r_game from game code

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index cad717dadf2be80ce54baa8b7420d80c93f469cd..166c2ed26d9fbf4e9effd687a3005289cdff14a3 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -304,7 +304,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 62866c03554938c018c564580e8e91b0f504162a..6ecd2c5db2b4359925ee1c180ca7fc2974a65582 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -455,7 +455,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 c83a8fa0d78e9577085fecbd707d82750bf45606..a580596b118b6db3b5721c19a53c94bb59b37c82 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);
@@ -856,7 +856,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 a95fa0a529707f1cd0c718e09822f3a1d0b5fd9a..91db892681e4a33cb4edcb747625f3a843564e85 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,
@@ -1785,7 +1785,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 89faffbf5ec6eb8097ba25ca58e42323dfce382f..a9c46397bc9a158690c79cd568da0fbe8b4df969 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;