From 9b3c2b6a74716f747b9e2a0812d1eb37b02d6e74 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sat, 24 Sep 2022 21:56:21 +0200 Subject: [PATCH] Disable precise crosshair when using chasecam or cameras. --- language.version | 4 ++-- zscript/handler/swwm_handler_crosshair.zsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 58f72fd3a..c0da5eb21 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r504 \cu(Sat 24 Sep 21:46:21 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r504 \cu(2022-09-24 21:46:21)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r505 \cu(Sat 24 Sep 21:56:21 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r505 \cu(2022-09-24 21:56:21)\c-"; diff --git a/zscript/handler/swwm_handler_crosshair.zsc b/zscript/handler/swwm_handler_crosshair.zsc index 9c536207c..8bc4dbead 100644 --- a/zscript/handler/swwm_handler_crosshair.zsc +++ b/zscript/handler/swwm_handler_crosshair.zsc @@ -106,7 +106,7 @@ extend Class SWWMHandler double frametime = (MSTimeF()-prevframe)/1000.; double theta = clamp(15.*frametime,0.,.5); // naive, but whatever // draw precise crosshair(s) - if ( automapactive || !(players[consoleplayer].Camera is 'PlayerPawn') ) return; + if ( automapactive || (players[consoleplayer].Camera != players[consoleplayer].mo) || (players[consoleplayer].cheats&CF_CHASECAM) ) return; if ( !swwm_precisecrosshair ) return; if ( crosshairforce ) return; if ( !crosshairon && (swwm_precisecrosshair <= 1) ) return;