From d20773a56ff70ae0ebb8155984150daaaa77667d Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Wed, 29 Dec 2021 21:46:20 +0100
Subject: [PATCH] Additional exit marker types.

---
 language.version                           |   4 +--
 sprites/EIXTC0.png                         | Bin 0 -> 918 bytes
 sprites/EIXTD0.png                         | Bin 0 -> 923 bytes
 zscript/handler/swwm_handler_worldload.zsc |   8 +++--
 zscript/swwm_thinkers_hud.zsc              |  10 +++---
 zscript/utility/swwm_utility.zsc           |  36 +++++++++++++++++----
 6 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 sprites/EIXTC0.png
 create mode 100644 sprites/EIXTD0.png

diff --git a/language.version b/language.version
index 735d3de14..ed16a6c7c 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r100 \cu(Wed 29 Dec 21:41:34 CET 2021)\c-";
-SWWM_SHORTVER="\cw1.2pre r100 \cu(2021-12-29 21:41:34)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r101 \cu(Wed 29 Dec 21:46:20 CET 2021)\c-";
+SWWM_SHORTVER="\cw1.2pre r101 \cu(2021-12-29 21:46:20)\c-";
diff --git a/sprites/EIXTC0.png b/sprites/EIXTC0.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdfb2043a447fe4e39548284f9320881b0df3499
GIT binary patch
literal 918
zcmeAS@N?(olHy`uVBq!ia0y~yU=RUe4mJh`hTcwDUIqpRj`SkOBnAcskRmRPn{#e5
zFfe<1x;Tbd^wx%YX9p(=*nXerF>BVfFq7^G?$AKZrbk|DBBIP6`5j3Ob=mUhp7^2{
zUV<*$_5Lt&1+mCKIF+Qmh&A>~gs-rV{H6BJ%6r?5i;JDLGTYDWJ$csrxwY~AnLD{o
zu(7f2@lav%y?jK}b!BzJyyu;}*KwcT^uU78=kk>IZHWrgPb<#!(W<Ji-*0YX)8nGl
zSYW{ud;Mr=s3?C=qeKhis;gRBQ@Kt(HR?L5^y#OKn!0-8?QP4819Zd=e{`;W@%D~~
z0$0ctiA9ZyHEn!%-%9N`DShF)CexmZud@U$G&kIpoolhNTD-*9_0f&Ml9JrkMVwn2
zcJ^^!FV^&xX4@EZ!sqex6WmjHg!8I)?JJbsaB&y^w}sW`?^Ve*-wO0v5wwbL^Q<2#
z4gY7~Vp+el^1y59aKoZ^I$Yh|yhkH4eI?nR-4HVpo*x+VqxYL`?213L8b7PIXKmb&
zb!JvW@ca9U)>d4$Qb*4}SH4l1#c|QMaAp3#^F^0um<Idpt?8_FUY;n<Wsv^-!`FYz
zTaMhi#`RIM=;BTdz3%I(+hZ%uDn6Ti+PpbJ>Nm&Q&9W0KWaQ`Dv@L$wk$d}G>eR1a
zJ{n3G2&~cPz9czcL-%R=EV)B}zUMF6E359Gbb8<4l2fTd+ZuO<bY=MzatS_&xURnN
zbL-Owg3e+((x;Uo0v7t+xKPe;GTpy1Kq8i9)%F_>YRa>3&+~}m;7GVI`^<$!?J-x2
z9_n9;S959RwqLfP_5+7i+qnl<=SFATzSUd0_Vr&gkz6D1E5D=D%iipn9eR7|jMK`t
zc4`eZSy>sfhc1S_$bGv(GvKkruG?2Er=>hjKl!9Z(VyE(YT0XMw-vnn@jJFG3bttY
zzx~C!3sVfAnllP%T%RH7b?TtRqg|3>hN=w#TU^BoHnTUVeO=?_%(6=Db@6F$1BoeK
zM{gQxCTjfkeB8l*q$KytJbQm<#g?N#Ei+6V?EdnfpP%^mnZ>E4N}Dcg_Sn~`^!T=W
z?67k_wu*U~$DaI4l6&^n99<uqyW>;nmt{X@Jx*x9tdh2E&Zch3uJy)G9A}<QEByP;
zR&v9_0FOE9<;kZSrEXZZ?G4fD6z}k{nma9sqj%msxk^?RhJ&?R!x^sI2DneqV!oX1
c@RNPpiSjjT>nnFNFfcH9y85}Sb4q9e00P0H82|tP

literal 0
HcmV?d00001

diff --git a/sprites/EIXTD0.png b/sprites/EIXTD0.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fdbdf109a17fb630579f951ce6416643ce9ff1d
GIT binary patch
literal 923
zcmeAS@N?(olHy`uVBq!ia0y~yU=RUe4mJh`hTcwDUIqpRj`SkOBnAcskRmRPn{#e5
zFfjXhx;TbdobC<v&hbeU`S)(`e;?n|8lkgRWCcx~l*ch!O~`lSi*16^odVn|Z``QN
z*|24z#~Pg@vwAsHk2D?8)^M`U3~^5r(M>z^+wR|e%k+0^-B*1~KUe#w_+0t^;&<ie
zwmM`dBpgr?;<V^fPK&%Y$Mv*?^0KXM&nr2a7}mW$Rk}9JS#P?t*3?ZQ_4WHD<>cI|
ztF0e>w3rf<v@N&WwYyQGg>ltYEv>0sr=A*h9aZ}D)8^Q*V-J4s3zV7SqqZ@(fJ1v%
zb>hXn5}SYbDmt|t<L9^|{^3CJ!dm{HUs(KPY;{;dp4{J*r)>7-7Vqsqi8q<YZ*6<J
z!7}%D)5R&PE?#I<6Pu#8^oN~w^Xv8Z4z8W@VcxgJOAXH7x^}zM*LH4kX-}5BX5gyO
zU3?$joNZzFw>Rg{bEA~w`gac<<i2h&Tl>OX)AjSCIF2l?vh`p3@n^N5?Ao&@#I#OS
zGIBkAWuGj@vd7-4k^QlxiK#}6bZvWWt!+kj-lSi3zvs<2Pdhjzf8U%V|K`pPT=8>;
z-Y$#s_oma-q{Vf5S7{&en8>r&Q;6+}M|JwQcL$E&w3(N-f05<81-XSx;`uhMo0v-0
z`*@}Hvb?flV|Hswjg+YR+cw8{hj=jGG5eZDzZt5xtvf#LYj(i0?J>%U{%OkuFW4P_
z5x~l`>c@eihMY??>!OZCmupPZei6NwCtPm1g9_&s=6_19CDWXk*uJ<f_i<oYd@rSq
zajv7Iy;tfUiTOgjeko}iii6Gh)<pFMPj|m?bC-y>l=Q2}!09YLhyJ|EKl<iI&z4E*
z{wIU$?P{Xgm()2qpE>r(MdmE0YvY^u2b9xht&_acvM9ai(1hi!3ws-uu`_QA_}I^r
z`+srppAYr(8Dg$Cy)TlVY{(faFEy#iq;1FCn)Phm=X!Y!3pX5AJlJRY$@5sQg^J0y
z|G#wI7nm}Ys9LM3^87q$(`T~WudluAi_)`*8UKvD8~iv{6n;IIyhS&<N$G02(cFVS
zC%PNu*0AwN8eNk~P_*v+viP>ew<mcsvX)eGFZ6i5YH@<>mEQXs)K;HMt2cb&IP+vm
z!M87-k{dQg`1GiMf3NADmGD?%ThL0CFbxp{Q&ZKY6DD4~dR29P1BZgu|JT9?O8c(}
iE<JVNi{yqnCTE{UKJmjd4>K?@FnGH9xvX<aXaWGkj-{pm

literal 0
HcmV?d00001

diff --git a/zscript/handler/swwm_handler_worldload.zsc b/zscript/handler/swwm_handler_worldload.zsc
index 86d06a064..b66bffeae 100644
--- a/zscript/handler/swwm_handler_worldload.zsc
+++ b/zscript/handler/swwm_handler_worldload.zsc
@@ -297,8 +297,10 @@ extend Class SWWMHandler
 				let a = SWWMTeleportLine(Actor.Spawn("SWWMTeleportLine"));
 				a.tline = l;
 			}
-			if ( !SWWMUtility.IsExitLine(l) )
-				continue;
+			bool isexit;
+			int exittype;
+			[isexit, exittype] = SWWMUtility.IsExitLine(l);
+			if ( !isexit ) continue;
 			if ( skipme.Find(l) < skipme.Size() ) continue;
 			skipme.Push(l);
 			// look for connected lines
@@ -362,7 +364,7 @@ extend Class SWWMHandler
 			for ( int i=0; i<con.Size(); i++ )
 				lpos += SWWMUtility.UseLinePos(con[i]);
 			lpos /= con.Size();
-			SWWMInterest.Spawn(lpos,theline:l);
+			SWWMInterest.Spawn(lpos,theline:l,theexit:exittype);
 		}
 		// spawn loot
 		if ( !deathmatch ) Chancebox.SpawnChanceboxes();
diff --git a/zscript/swwm_thinkers_hud.zsc b/zscript/swwm_thinkers_hud.zsc
index ba21a87a8..a91f9c140 100644
--- a/zscript/swwm_thinkers_hud.zsc
+++ b/zscript/swwm_thinkers_hud.zsc
@@ -156,14 +156,14 @@ Class SWWMInterestMarker : MapMarker
 	States
 	{
 	Spawn:
-		EIXT AB -1;
+		EIXT ABCD -1;
 		Stop;
 	}
 }
 
 Class SWWMInterest : Thinker
 {
-	int type;
+	int type, exittype;
 	Key trackedkey;
 	Line trackedline;
 	Actor marker;
@@ -171,7 +171,7 @@ Class SWWMInterest : Thinker
 	SWWMInterest prev, next;
 	String keytag;
 
-	static SWWMInterest Spawn( Vector3 pos = (0,0,0), Key thekey = null, Line theline = null )
+	static SWWMInterest Spawn( Vector3 pos = (0,0,0), Key thekey = null, Line theline = null, int theexit = 0 )
 	{
 		let hnd = SWWMHandler(EventHandler.Find("SWWMHandler"));
 		if ( !hnd ) return null;
@@ -197,9 +197,9 @@ Class SWWMInterest : Thinker
 		else if ( theline )
 		{
 			i.type = INT_Exit;
+			i.exittype = theexit;
 			i.marker = Actor.Spawn("SWWMInterestMarker",pos);
-			if ( theline.special == Exit_Secret )
-				i.marker.SetState(i.marker.SpawnState+1);
+			i.marker.SetState(i.marker.SpawnState+theexit);
 		}
 		else
 		{
diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc
index 6b39e80c3..983dbb1a1 100644
--- a/zscript/utility/swwm_utility.zsc
+++ b/zscript/utility/swwm_utility.zsc
@@ -14,6 +14,14 @@ enum EDoExplosionFlags
 	DE_COUNTFHKILLS = 512	// only count kills for enemies that were at full health
 };
 
+enum EExitType
+{
+	ET_Normal,
+	ET_Secret,
+	ET_EndGame,
+	ET_NewMap,
+};
+
 Struct SWWMProjectionData
 {
 	swwm_GM_Matrix wtc;
@@ -410,17 +418,33 @@ Class SWWMUtility
 		return locknum;
 	}
 
-	static clearscope bool IsExitLine( Line l )
+	// return if a line is an exit, and additionally the type of exit
+	static clearscope bool, int IsExitLine( Line l )
 	{
-		if ( (l.special == Exit_Normal) || (l.special == Exit_Secret) || (l.special == Teleport_EndGame) || (l.special == Teleport_NewMap) )
-			return true;
+		if ( l.special == Exit_Secret )
+			return true, ET_Secret;
+		if ( l.special == Exit_Normal )
+			return true, ET_Normal;
+		if ( l.special == Teleport_EndGame )
+			return true, ET_EndGame;
+		if ( l.special == Teleport_NewMap )
+			return true, ET_NewMap;
 		// E1M8 compat
 		if ( (l.special == ACS_Execute) && (l.Args[0] == -Int('E1M8_KNOCKOUT')) )
-			return true;
+			return true, ET_Normal;
 		// spooktober™
 		if ( ((l.special == ACS_Execute) || (l.special == ACS_ExecuteAlways)) && (l.Args[0] == -Int('MapFadeOut')) )
-			return true;
-		return false;
+		{
+			if ( level.levelnum == 1 )
+			{
+				let lv = levelinfo.FindLevelByNum(l.Args[2]);
+				if ( lv && lv.mapname.Left(6) ~== "SECRET" )
+					return true, ET_Secret;
+				else return true, ET_NewMap;
+			}
+			return true, ET_Normal;
+		}
+		return false, ET_Normal;
 	}
 
 	static clearscope bool IsTeleportLine( Line l, bool all = false )