From ec26c5d1402c73de3a69a1ad3c1c3948844a6b90 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Thu, 8 Feb 2024 15:08:09 +0100
Subject: [PATCH] Added a 3D check to FXCameraAttachScript

---
 scripts/fxcameraattachscript.pex        | Bin 2134 -> 2215 bytes
 source/scripts/fxcameraattachscript.psc |  84 ++++++++++++------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/scripts/fxcameraattachscript.pex b/scripts/fxcameraattachscript.pex
index b6e6410773dfd25d3bff8664d79e1bb2cbea5071..06224f9d399282b614f79dbafa9d19a379ca7834 100644
GIT binary patch
literal 2215
zcmb7E+fo}x5Iu_|?ud&qHrO$PV}~ThScsb?@(^q;MNGg2B=K8n*d2*Y#I9<01m-!v
zln?Mjz9W_I$WzYDXoX}~B^7mPtGl-^r%$)^_fH@G%=N(oKkARa)^UID-D`QN61lCl
z^e;~RBy8&CX6j>jHwfZZlC~NGMV0Bx*I^{^4W?`FeVZq3UTX7LbZ}qkQ!TZ^(0;6A
zrxuTo&Q1>Y_jgZrkIr^aP&|&#lCWM^$)S>03WLYd57A*P1N2{nL7*ax_;D13I*cRP
z!1(d`FUr>^s-_YZ`3k=|uqqW&I26Lc5ViN>T&5}zaU}GG63rxTszl$2RB1uv#+PJu
zmc@1>jm3pDb<#$xg^oo{2FgUrNQ9TNu0-0DzG8iwn{sBM!%MY{>1wr`xxIHkU&#cc
zS7F+c4OOcVG46gGQ?^0l)vBp+7+!|jI&ue*2EB)I+&qn2QDD7=)TkH^qf|@IeXxU}
zP9Da4yO&WZM}c@N6CL^u0#58WZC*H-BWg)RoU>&pI=>Nts>xPEqu5&urT;Edi|gGL
zhC0x(l{S?h*2uYmZ&t$Y&4#>LvRmM0IvX%(BGp|de?$jH<geSl**<rU0kWkon;R%d
zU&l#iZ)VC%<X^>cBQq-)s#Z;vAGwZvoeRTIUFo+3py)W&aTBBFdC;a6`BXL7=34UL
zqB<&jt;ja##<}+NI@JCJZ%to>sfg_<nu*LQxk*Ek$qn)52P1XuPQL$CC#KkN9PLJd
z^KlTTjK<L`RSzR)E%x?Hlx`)FX{UtWN_g?a;Ho<!R>~M`Yo(61l8s-=l#ZvIdDb#z
z6@|S<EOlnDBX8)z@Ikt|V}6G!$o?T-puk_Xhd%R<VU%2^<bfH?wq*_vtUSWJl_$vL
zDKatHEH;hjZCS<($_mPqmt9gp1zQx8&=1_fx7cpWYwWb;JKV|}yutT`IKclOk4gOG
zK41vL7OUwxf>EnuEK`aYw{d*@jtNY<*Hg|5<k@!Il^Q^ipht1ngbc9442^rv7{Ps}
z&N^d)@upb;b1u^i@PIf9c!<yNh}t{^7WjS4km*?upL=-X;h`n9=;0CdaS!uMqcKCx
zyqTmjVwBuH4^OFkcx+6MVbfM&z*twn*e3z3z2ISjaSJ9c&nC2|jE-TeFSw9}EF?#C
zlODdfEj8tO5kt<yV&?C|m(I`2n8R15pc(sXJmb@hX+SUCCV=3c^F6)GU0!bQ8IPg!
z@#YxD?RS_oD=Cq=6*5^Slcw~YjF>`)$`v~jXDNGF`Gl@=FJ1qd)<t4Fja5sI#8O5g
z?GB05OD?2DTsGu?kjU{mv%0Gpz$#~5<E-nPdxPIi{z%N+6`tlyXXMpv<TVegT<p5N
zo;6}vH*Y#5<q2-nLy@dhZ;yz(<gIO@mzmz!jEde^mfLW2Y?wY~&s%n*)`WY#K^WF9
Z&?dk|*L}i6#U$~B*I0durUT%f{{Y%tk5>Qy

literal 2134
zcmb7E-Bu$-5dMZFK==!=**{p9#%0}ASxB-Agm|H_0-Ga}JqhaGd74Ql8BMx#W;!6(
zzJpKV19*-;hY#X~THQSplJ)O6buy{$uKKFJs+#`otDk;NO~3;^_1}M4#=YY=FL_Ud
z{6K5&cN%^e^z~Lh@-f-qy+}!959;TyKCjj4MO2XgJ9EOCJ`uX1xfaNtD6O2jP&+%X
zS5Hok>PKhiM|CXJ<arph+af#_{8C`LCcluUiZ?OY37SnIG3zVY40NC*?;=;b_(u4;
zE?OcK(iiyN<tQS?nQxP3+-A*M-?0lGi6&E$>5gFiQ1wNquURBC3*26q;B2vjZlqX;
z8=R=CG}DT;cvBclE?LmyZNZ{G_XXiwyojPP9rVN&a+QivPJ>>czrN%lQdOyOyHXh~
z<MEr4J)64>q5<!UR*Q%r|F)5}nF(a1Iq|E0YQRsG>NnItHtk_1GAgpekXRUxgTiYb
z>cH<(uAyZTmxMUE8f~(cYO{-L))Xy1=xXG~5lYxE$tL@67)g~Hm?Dp0WrykFqo^<Z
zphYz|DVvs13jHp>-n3ny&I~)S$)u8E6eoQ~8<^$a9{8sF)N@Qxp+&D>K!*ETg~_^@
zC?%v1mFgzT=g1s)71zjCDhBLJYE2CB0_iq25ZSiSuPGrBB5nSWjzqVG{o{eOQK{9`
z@8~MfeusukcY=s1JA;ObnJY&zpc+uiXxOKvxN@^T+0bDi+n7=ENH*Obg?GxFl82%l
zNVl4H#EL^E`$)D5NH?_VW6r#*@myf)iqkhi;4z<_MA=Q0y+kSF$vB%(=s_qA8NvKP
zNFNe0G`YuDz|VgmL*K8533DYFC6y>?U>WygS;4B6hgh?+fyYBJUIdcIvskvUO;SXO
zWN$>uDAOHMv0)~GTlg5C#Bzw2vAn{KR8hrel-d;CFrK@$Qa>Pz8JnYtI*U1@o1}ll
zJQnN$a*49&j)5iOVxKgHopVrA<eewW+vZ@3obJ%#u3OCGo@H-OmdM@&OJl`(8pf-X
z$0Q!$9Xup$4Gime7mvtfg90qy_wd-mdmbLxf-ZP?NP5o08oAQq4r%5jM@r5pX);;&
zFnia-6Wa3d$n2)9^*Zuq;gRk9Uv20A$#%)uW?bl}4tL4JhJ~UO$ZwIB4%)q`kSlnf
zyy)@p0Y0R+p_C%;O%G4wNFdi|bWXclBfC_OVS$Jc%>YAz3RI*58I)TI*UYdw1(OUY
z#iEA-!If^Pd$c)D`(NFXD%`jc>b8d^3c78JMm44NqK!CX^=)UeotUI3uVoL<W10lD
z=rW+ps1pf&Zvro99EM!oFl4YpTz84<9`P>I&v4EUsqQ3HcRlP-E_=4MyA*rRoR~cA
zAedT@mtl3h46(ro;n;xKlpW!6LYUS=!laj-Ntt3<lm9_D9*_x|iG9;E_joHb34a3D
Cw1OP~

diff --git a/source/scripts/fxcameraattachscript.psc b/source/scripts/fxcameraattachscript.psc
index c758e03e..0c0cbaf9 100644
--- a/source/scripts/fxcameraattachscript.psc
+++ b/source/scripts/fxcameraattachscript.psc
@@ -21,51 +21,33 @@ int Property timeLimit = 180 Auto
 
 ;===============================================
 
-	EVENT ONTRIGGERENTER(ObjectReference akActionRef)
-	IF (akActionRef == getPlayer() as ObjectReference);new
-		if(CameraAttachFX) ; Block added by USKP 1.2.6 because apparently not everything is using the default values.
-			CameraAttachFX.Play(akActionRef, timeLimit)
-	; ;		debug.trace("Triggered by player")
-		EndIf
-		if (CameraAttachFX2)
-			CameraAttachFX2.Play(akActionRef, timeLimit)
-		endif
-		;if (CrossfadeableISM)
-		;	CrossfadeableISM.ApplyCrossFade(2)
-		;endif
-		if (LoopSound)
-			instanceID = LoopSound.Play(Self)
-		endif
-		;wait (27)
-	endif ;new
-		;goToState ("reset")
-	endEvent
+EVENT ONTRIGGERENTER(ObjectReference akActionRef)
+IF (akActionRef == getPlayer() as ObjectReference);new
+	if(CameraAttachFX) ; Block added by USKP 1.2.6 because apparently not everything is using the default values.
+		CameraAttachFX.Play(akActionRef, timeLimit)
+; ;		debug.trace("Triggered by player")
+	EndIf
+	if (CameraAttachFX2)
+		CameraAttachFX2.Play(akActionRef, timeLimit)
+	endif
+	;if (CrossfadeableISM)
+	;	CrossfadeableISM.ApplyCrossFade(2)
+	;endif
+	if LoopSound && Is3DLoaded()
+		instanceID = LoopSound.Play(Self)
+	endif
+	;wait (27)
+endif ;new
+	;goToState ("reset")
+endEvent
 
-	EVENT OnTriggerLeave(ObjectReference akActionRef)
-		IF (akActionRef == getPlayer() as ObjectReference)
-			if(CameraAttachFX) ; Block added by USKP 1.2.1 because apparently not everything is using the default values.
-				CameraAttachFX.Stop(akActionRef)
-			EndIf
-			if (CameraAttachFX2)
-				CameraAttachFX2.Stop(akActionRef)
-			endif
-			;if (CrossfadeableISM)
-			;	ImageSpaceModifier.RemoveCrossFade(3)
-			;endif
-			;USKP 2.0.2 - Added check for invalid sound instance.
-			if (LoopSound && instanceID != 0)
-				StopInstance(instanceID)
-			endif
-			goToState ("waiting")
-		ENDIF
-	ENDEVENT
-	
-	EVENT OnUnLoad()
+EVENT OnTriggerLeave(ObjectReference akActionRef)
+	IF (akActionRef == getPlayer() as ObjectReference)
 		if(CameraAttachFX) ; Block added by USKP 1.2.1 because apparently not everything is using the default values.
-			CameraAttachFX.Stop(GetPlayer())
+			CameraAttachFX.Stop(akActionRef)
 		EndIf
 		if (CameraAttachFX2)
-			CameraAttachFX2.Stop(GetPlayer())
+			CameraAttachFX2.Stop(akActionRef)
 		endif
 		;if (CrossfadeableISM)
 		;	ImageSpaceModifier.RemoveCrossFade(3)
@@ -75,4 +57,22 @@ int Property timeLimit = 180 Auto
 			StopInstance(instanceID)
 		endif
 		goToState ("waiting")
-	ENDEVENT
+	ENDIF
+ENDEVENT
+
+EVENT OnUnLoad()
+	if(CameraAttachFX) ; Block added by USKP 1.2.1 because apparently not everything is using the default values.
+		CameraAttachFX.Stop(GetPlayer())
+	EndIf
+	if (CameraAttachFX2)
+		CameraAttachFX2.Stop(GetPlayer())
+	endif
+	;if (CrossfadeableISM)
+	;	ImageSpaceModifier.RemoveCrossFade(3)
+	;endif
+	;USKP 2.0.2 - Added check for invalid sound instance.
+	if (LoopSound && instanceID != 0)
+		StopInstance(instanceID)
+	endif
+	goToState ("waiting")
+ENDEVENT