From a04665df153fa20762b6ed1d56177f3264e8d8f7 Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Tue, 8 Jun 2021 11:08:18 +0300 Subject: [PATCH] render: fix holmes --- src/game/opengl/r_game.pas | 3 +++ src/game/opengl/r_player.pas | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/game/opengl/r_game.pas b/src/game/opengl/r_game.pas index 3d2befe..e200923 100644 --- a/src/game/opengl/r_game.pas +++ b/src/game/opengl/r_game.pas @@ -25,6 +25,9 @@ implementation uses {$INCLUDE ../nogl/noGLuses.inc} +{$IFDEF ENABLE_HOLMES} + g_holmes, +{$ENDIF} 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 25a2dd7..25cd55f 100644 --- 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, +{$IFDEF ENABLE_HOLMES} + g_holmes, +{$ENDIF} r_playermodel ; @@ -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; -- 2.29.2