render: system: move gl related code from system driver

[d2df-sdl.git] / src / game / opengl / r_player.pas

diff --git a/src/game/opengl/r_player.pas b/src/game/opengl/r_player.pas
index c054d06e5739f91ed50b37ba2e7d2bf7449245a7..b9ff8bb8416099d488c03a3c22cc39cfa4db17f2 100644 (file)
--- a/src/game/opengl/r_player.pas
+++ b/src/game/opengl/r_player.pas
@@ -17,7 +17,7 @@ unit r_player;
 
 interface
 
-  uses g_player, e_graphics; // TPlayer, TRGB
+  uses g_player, g_base; // TPlayer, TRGB
 
   procedure r_Player_DrawAll;
   procedure r_Player_DrawDebug (p: TPlayer);
@@ -42,7 +42,11 @@ implementation
   uses
     SysUtils, Classes, Math,
     MAPDEF, utils,
-    g_basic, g_game, g_phys, g_map, g_textures, g_menu, g_language, g_weapons, g_items, g_net, g_options
+    g_basic, g_game, g_phys, g_map, g_textures, g_menu, g_language, g_weapons, g_items, g_net, g_options,
+{$IFDEF ENABLE_HOLMES}
+    g_holmes,
+{$ENDIF}
+    r_playermodel, r_graphics
   ;
 
   procedure r_Player_DrawAll;
@@ -357,15 +361,15 @@ begin
         else
           dr := True;
         if dr then
-          p.Model.Draw(fX, fY + fSlope, 200)
+          r_PlayerModel_Draw(p.Model, fX, fY + fSlope, 200)
         else
-          p.Model.Draw(fX, fY + fSlope);
+          r_PlayerModel_Draw(p.Model, fX, fY + fSlope);
       end
       else
-        p.Model.Draw(fX, fY + fSlope, 254);
+        r_PlayerModel_Draw(p.Model, fX, fY + fSlope, 254);
     end
     else
-      p.Model.Draw(fX, fY + fSlope);
+      r_PlayerModel_Draw(p.Model, fX, fY + fSlope);
   end;
 
   if g_debug_Frames then
@@ -395,7 +399,7 @@ procedure r_Player_DrawAim (p: TPlayer);
   begin
 
 {$IFDEF ENABLE_HOLMES}
-    if isValidViewPort and (self = gPlayer1) then
+    if p.isValidViewPort() and (p = gPlayer1) then
     begin
       g_Holmes_plrLaser(ax0, ay0, ax1, ay1);
     end;