From 82a303642947fca3128d300820fe84b7940b5aff Mon Sep 17 00:00:00 2001
From: nashmuhandes <nashbackslash@gmail.com>
Date: Tue, 5 Oct 2021 18:17:28 +0800
Subject: [PATCH] Set the ZDRay-specific things to not spawn in the MAPINFO

---
 wadsrc/static/mapinfo/common.txt              |   8 ++---
 wadsrc/static/sprites/LPROA0.png              | Bin 1907 -> 0 bytes
 .../zscript/actors/shared/staticlights.zs     |  32 +-----------------
 3 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 wadsrc/static/sprites/LPROA0.png

diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt
index 5b8263c853..c26cac2090 100644
--- a/wadsrc/static/mapinfo/common.txt
+++ b/wadsrc/static/mapinfo/common.txt
@@ -136,10 +136,10 @@ DoomEdNums
   9872 = SpotLightFlickerAttenuated
   9873 = SectorSpotLightAttenuated
   9874 = SpotLightFlickerRandomAttenuated
-  9875 = LightProbe
-  9876 = PointLightStatic
-  9881 = SpotLightStatic
-  9890 = ZDRaySunlight
+  9875 = None	// ZDRay light probe
+  9876 = None	// ZDRay static point light
+  9881 = None	// ZDRay static spotlight
+  9890 = None	// ZDRay sun properties
   9982 = SecActEyesAboveC
   9983 = SecActEyesBelowC
   9988 = CustomSprite
diff --git a/wadsrc/static/sprites/LPROA0.png b/wadsrc/static/sprites/LPROA0.png
deleted file mode 100644
index 68a1531fd558901dfd533db3cfee45b10efb51a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1907
zcmb_dO^@3|7<LO<m7?;YN~lyqGVWzp;Mn6Nc06iYwn=D$*4rqXs@vO+XU2)OvB$N&
zo9x1&sz8Vva75gDg98T+AaURhCw>42&YX}y9LhURVqm+as}+{*`Fh^(XJ$U?Z{ECc
z{_=T6Q7-hl?E$ne$?x1V@L$zm+=AxZC|&nuD;K_e*Zv;bmHx)C^Qd@kzxUe&X3pk=
z&8<huFJGJQ!05T8dpA>*=P%0djPlv%mq6y*aJZdsdmEUFs6v?Vd1V$QfL4^N*JlZ#
zyF6EYJ__Te_Ukv_X==!t+MT**dP$3q!|q|qw+=Ul^l+EDOuK$fy*k67AmTYuXVE0i
z@T{p7dNK6nw4td5B;Rdn>(ZdQ?e*1`NV!_C*g8cuOLg1|vQ5{jy{TFzatzZkP*pb(
zHf>yW)y1QMwUh;T(0+Si3r0<CoaYHPjOlb*nN}+z9T~`VUBk2t%hCa%X9sakW_p}m
zS!!tWjHY3dhay&`M&gUTys3ew^AMt>R2yfDG(p0Q8A%LOF=a>vkkJyC?4^^!IHLxi
z@QBBG23S;LAxoZD!jDxOMI}1RJNw|#BDQ1E+3+CY#(-yHFQvS*4;HU19ZSX{7ui@m
zA&zpnj3&XYl#^VfLm?*1LiLwg)K*ItrlGFh31cRv*_t%8kl}5T^QLB*7Sc^ux9UTL
za2-M6-Y^^3H0MwcsK7{0j)3i<X<>j>tN#KE76u1Tg))i*kwyd(6-H#ljU*lw);tgQ
z;w&dI<-K-O16M0y$S`$$RIf8zH+h5Wwo_~9jhfxi{Td07i!AQDd@0`+bWav>DbGNj
zICYCq8tAABfx5nwcVNhDZU?rFoQ7pB<!_}SY$7r_y`Hj2xFsec^#qey*3`e}d#zSK
z6+t+Gg=}#1hT7}2Y~<RuZdH)vdcir|4Kpb0!D9Dp@q3HjBvcEUVM66jXlhhafHQ3|
z9Uhaylciv;b~@&u^gnnphh-wjrzGX;BS`m2sAoLM|BUQE#e16tuH!PDk%p~1)moqv
z%XM|atA2n2->ou#8T}FOfv5<hI=oAwp3?h8a_N}FBMyhFp`AXSlM(vZYCOL2{?~X6
zd92Q<W*lW<vG$K67|K~p!MQHG<%I%+@=D?{q$-6A=a1JPJcP??t=C>3UV4@8JbQL!
zRr%_Z-*;YKVb{9vpZVa&`#-$)*8QK&jfeE`g`fUZUg;}qpMHGnLwUvZI-Bh;ZtOhx
E3(QJO(EtDd

diff --git a/wadsrc/static/zscript/actors/shared/staticlights.zs b/wadsrc/static/zscript/actors/shared/staticlights.zs
index f799a9c2e9..f265ef564c 100644
--- a/wadsrc/static/zscript/actors/shared/staticlights.zs
+++ b/wadsrc/static/zscript/actors/shared/staticlights.zs
@@ -2,34 +2,4 @@
 // Will despawn from the world as they serve no purpose at runtime.
 // Currently used to light Actor sprites.
 
-class LightProbe : Actor native
-{
-	States
-	{
-	Spawn:
-		LPRO A 0;
-		Stop;
-	}
-}
-
-// Dummy Actors used to hold UDMF keys that ZDRay will parse lighting data from.
-// These will simply despawn from the world at map start, as they serve no purpose at runtime.
-// Currently only covers the basic point and spot lights.
-// Lightmaps currently do not animate, so the various animated lights (pulsating, flickering etc) are skipped for now.
-
-class StaticLightBase : Actor
-{
-	States
-	{
-	Spawn:
-		TNT1 A 0;
-		Stop;
-	}
-}
-
-class PointLightStatic : StaticLightBase {}
-class SpotLightStatic : StaticLightBase {}
-
-// Sunlight Actors to define sunlight properties for the current map
-
-class ZDRaySunlight : Actor {}
+class LightProbe : Actor native {}