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 5b8263c85..c26cac209 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
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L*Tj`SkOBoGafSYK^+n1O+T
zEx;$l^*<Pd)_l!jU|?V>3Gxg6&+v4+ffoY<180FpWHAE+w=f7ZGR&GI!N9<_Co?3X
zB*NFnDmgz_FEJ%QDOIl`w}1fzZ0suv5|gu2OB9k)(=+pImEP~(ucVNfVyhHx>TBRz
z;GCL~=}}db8eHWUl3bOYY?-2DZ>L~WVO5b^kegbPs8ErclUHn2VXFi-*D9~r3M8zr
zqySb@l5MNx2(nNi!Z$#{Ilm}X!Bo#oH`&m{NWt7v&(O@k(#S+d!N|bST;IT4-_Tgs
zz|hLT%*xnO0Sc7t6l{u8(yW49+@N+9rKH&^Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG
z80i}s=@zA==@wV!l_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{yVymPCHMSzR0B&qv
zF*KNx^K<np5)1SV^$b8>0{b;38LqCNv?vE`c}lW=YEEiyYF<gPzM-BWTx~^efv+!I
zIaXtHbK$CsOI*uJ@T)EksVqp<4@xc0FD*(=buCNHD^Z5|pdcf^B)>Q#ABR8S(s17t
zSUDG^CYIzEh2-bwz#=LDW{QHdGbmy#6g0v!^HTE5i#0(OLG`4%B$lMwDj69V8R{BX
z>Kd7b7#doc8d@1!Y8zNs85ls6`lgm7rX-dmqA4~DF)*?+u&^>VMp2xfl9^UXP-#lC
zRa$;gZeoe8Qf6*qda8awUOLz|UtcTFyyB9?yyR3*7h9!@+ycGK%oM9+^CUx4(-bpZ
zgH(%DT{CkN3tbBnGYj1$lf*PbOGBg7B+FEoewX~@Qcxtq^rvK|SS6a98YLztr|B9R
z8(8XECV}*uC#UJAn5CMfnVA`yTNoL^^!pcOrf23Q=8$g=Jd&)O^K<fxeDhO4p{%5U
z5chO;4k*e`%gjl&RVog0cT(_lbv84!G&9pR(lZ35b#R)q^2jVM$uFve=APixLMSUI
zQvsaJtP+z!Il)#b8I%N4Q<R{>nOK65xFCQSTb_}chc{h7lojWvm6RtIr8=gk=9LhW
z^z?DLzc{gsfa}dt(k#s_Q*=`jEzESyjZM;Y6OAk_brVyKlhO>+k}Qo=l3>0^bG=!J
zfuWV5sg<EAETNL=dT8J#XC&sOr>58{=_`@%AL0@;#G#n}LCbg$WhBQ2cK_&uid9Hb
z(??H*U^%2B*iOL)EEMG824aG13sB8rr+}!EQu9)5m5P+??S3jYEoWe0(DZb143Usb
zPGDhT(_q*<@kfFnTZ)}W3uEi~hI6tG4G#@`mM2&7UH#1<7Qmo6X@Y+{sEYG+^>bP0
Hl+XkK%t}kq

diff --git a/wadsrc/static/zscript/actors/shared/staticlights.zs b/wadsrc/static/zscript/actors/shared/staticlights.zs
index f799a9c2e..f265ef564 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 {}