From aa3343c56864ae1ecacc77afd2bf2ed9024fd19c Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Sat, 24 Sep 2022 22:12:12 +0200
Subject: [PATCH] Some precise crosshair fixes.

---
 language.version                                 |  4 ++--
 zscript/handler/swwm_handler_crosshair.zsc       | 15 ++++++---------
 zscript/weapons/swwm_baseweapon_precisechair.zsc |  3 ++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/language.version b/language.version
index c0da5eb21..6bd933279 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-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-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r506 \cu(Sat 24 Sep 22:12:12 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r506 \cu(2022-09-24 22:12:12)\c-";
diff --git a/zscript/handler/swwm_handler_crosshair.zsc b/zscript/handler/swwm_handler_crosshair.zsc
index 8bc4dbead..a857f60df 100644
--- a/zscript/handler/swwm_handler_crosshair.zsc
+++ b/zscript/handler/swwm_handler_crosshair.zsc
@@ -42,15 +42,12 @@ extend Class SWWMHandler
 		let sw = SWWMWeapon(players[consoleplayer].ReadyWeapon);
 		if ( !sw )
 		{
-			numcrosshairs = 1;
-			traceofs[0] = (0,0,0);
-		}
-		else
-		{
-			numcrosshairs = sw.NumCrosshairs;
-			for ( int i=0; i<numcrosshairs; i++ )
-				traceofs[i] = sw.GetTraceOffset(i);
+			numcrosshairs = 0;
+			return;
 		}
+		numcrosshairs = clamp(sw.NumCrosshairs,1,MAX_CROSSHAIRS);
+		for ( int i=0; i<numcrosshairs; i++ )
+			traceofs[i] = sw.GetTraceOffset(i);
 		let mo = players[consoleplayer].mo;
 		if ( !ctr ) ctr = new("SWWMCrosshairTracer");
 		ctr.ignoreme = mo;
@@ -106,7 +103,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 != players[consoleplayer].mo) || (players[consoleplayer].cheats&CF_CHASECAM) ) return;
+		if ( automapactive || (players[consoleplayer].Camera != players[consoleplayer].mo) || (players[consoleplayer].cheats&CF_CHASECAM) || (numcrosshairs <= 0) ) return;
 		if ( !swwm_precisecrosshair ) return;
 		if ( crosshairforce ) return;
 		if ( !crosshairon && (swwm_precisecrosshair <= 1) ) return;
diff --git a/zscript/weapons/swwm_baseweapon_precisechair.zsc b/zscript/weapons/swwm_baseweapon_precisechair.zsc
index 572c67168..3180f53e4 100644
--- a/zscript/weapons/swwm_baseweapon_precisechair.zsc
+++ b/zscript/weapons/swwm_baseweapon_precisechair.zsc
@@ -15,7 +15,8 @@ extend Class SWWMWeapon
 	{
 		Super.DoEffect();
 		// force custom crosshair
-		if ( swwm_precisecrosshair ) crosshair = 99;
+		if ( swwm_precisecrosshair && (players[consoleplayer].Camera == players[consoleplayer].mo) && !(players[consoleplayer].cheats&CF_CHASECAM) )
+			crosshair = 99;
 		else crosshair = 0;
 	}