X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=8c626569dfe2dd1e25476321c64567ea7333f5ff;hb=3a2594735abd86e583b35da46526b9d16a9cd0ed;hp=8c64fd0423ce66f9c7717fd1353abef54bd233a9;hpb=4b6c50349b6b2c268faecbb7f4567cd4f5e0d835;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index 8c64fd0..8c62656 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -592,11 +592,14 @@ uses nanoGL, {$ELSE} GL, +{$ENDIF} +{$IFDEF ENABLE_HOLMES} + g_holmes, {$ENDIF} e_log, g_map, g_items, g_console, g_gfx, Math, g_options, g_triggers, g_menu, g_game, g_grid, wadreader, g_main, g_monsters, CONFIG, g_language, - g_net, g_netmsg, g_window, g_holmes, + g_net, g_netmsg, g_window, utils, xstreams; const PLR_SAVE_VERSION = 0; @@ -2414,10 +2417,13 @@ procedure TPlayer.DrawAim(); var ex, ey: Integer; begin + +{$IFDEF ENABLE_HOLMES} if isValidViewPort and (self = gPlayer1) then begin g_Holmes_plrLaser(ax0, ay0, ax1, ay1); end; +{$ENDIF} e_DrawLine(sz, ax0, ay0, ax1, ay1, 255, 0, 0, 96); if (g_Map_traceToNearestWall(ax0, ay0, ax1, ay1, @ex, @ey) <> nil) then