render: fix holmes

diff --git a/src/game/opengl/r_game.pas b/src/game/opengl/r_game.pas
index 3d2befe2b9808707f47fea4143b95ff09c4a7d12..e200923be35bb5d3e9cf29583372a515bc073c7e 100644 (file)
--- a/src/game/opengl/r_game.pas
+++ b/src/game/opengl/r_game.pas
@@ -25,6 +25,9 @@ implementation
 
   uses
     {$INCLUDE ../nogl/noGLuses.inc}
 
   uses
     {$INCLUDE ../nogl/noGLuses.inc}

+{$IFDEF ENABLE_HOLMES}
+    g_holmes,
+{$ENDIF}

     SysUtils, Classes, Math,
     e_graphics,
     g_system, g_touch,
     SysUtils, Classes, Math,
     e_graphics,
     g_system, g_touch,

diff --git a/src/game/opengl/r_player.pas b/src/game/opengl/r_player.pas
index 25a2dd7bfe6ea22e51efe94dc9a5ecc84bc3d286..25cd55f36cb3b1ca042886b22575b54db205bfa8 100644 (file)
--- a/src/game/opengl/r_player.pas
+++ b/src/game/opengl/r_player.pas
@@ -43,6 +43,9 @@ 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,
     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,

+{$IFDEF ENABLE_HOLMES}
+    g_holmes,
+{$ENDIF}

     r_playermodel
   ;
 
     r_playermodel
   ;
 


@@ -396,7 +399,7 @@ procedure r_Player_DrawAim (p: TPlayer);
   begin
 
 {$IFDEF ENABLE_HOLMES}
   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;
     begin
       g_Holmes_plrLaser(ax0, ay0, ax1, ay1);
     end;