X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fopengl%2Fr_player.pas;h=bb25f29eebfb6c6eec199fd8e812c5072d910c06;hb=4b15e91b4468b9605893b647a080ccdfc2df4e8c;hp=25a2dd7bfe6ea22e51efe94dc9a5ecc84bc3d286;hpb=36fb40708726d6a0659f332a09c4c371473d0394;p=d2df-sdl.git

diff --git a/src/game/opengl/r_player.pas b/src/game/opengl/r_player.pas
index 25a2dd7..bb25f29 100644
--- 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);
@@ -43,7 +43,10 @@ implementation
     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,
-    r_playermodel
+{$IFDEF ENABLE_HOLMES}
+    g_holmes,
+{$ENDIF}
+    r_playermodel, r_graphics
   ;
 
   procedure r_Player_DrawAll;
@@ -396,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;