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 68a1531fd..000000000 Binary files a/wadsrc/static/sprites/LPROA0.png and /dev/null differ 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 {}