Skip to content
Snippets Groups Projects
Commit 4462224a authored by ZZYZX's avatar ZZYZX
Browse files

Oops quickfix: inherited generic lights did not work

parent 57911718
No related branches found
No related tags found
No related merge requests found
...@@ -347,7 +347,7 @@ namespace CodeImp.DoomBuilder.GZBuilder ...@@ -347,7 +347,7 @@ namespace CodeImp.DoomBuilder.GZBuilder
// +MISSILEMORE makes it additive. // +MISSILEMORE makes it additive.
// +MISSILEEVENMORE makes it subtractive. // +MISSILEEVENMORE makes it subtractive.
// +INCOMBAT makes it attenuated. // +INCOMBAT makes it attenuated.
LightData ld = GetLightDataByClass(actor.ClassName); LightData ld = GetLightDataByClass(p.ClassName);
if (ld != null) if (ld != null)
{ {
if (ld.LightDef != LightDef.VAVOOM_GENERIC && ld.LightDef != LightDef.VAVOOM_COLORED) // not vavoom if (ld.LightDef != LightDef.VAVOOM_GENERIC && ld.LightDef != LightDef.VAVOOM_COLORED) // not vavoom
...@@ -360,11 +360,13 @@ namespace CodeImp.DoomBuilder.GZBuilder ...@@ -360,11 +360,13 @@ namespace CodeImp.DoomBuilder.GZBuilder
dispType = 9820; dispType = 9820;
else if (actor.GetFlagValue("INCOMBAT", false) || actor.GetFlagValue("DYNAMICLIGHT.ATTENUATE", false)) else if (actor.GetFlagValue("INCOMBAT", false) || actor.GetFlagValue("DYNAMICLIGHT.ATTENUATE", false))
dispType = 9830; dispType = 9830;
if (actor.GetFlagValue("DYNAMICLIGHT.SPOT", false)) if (!actor.GetFlagValue("DYNAMICLIGHT.SPOT", false) && dispType >= 9840)
dispType -= 40;
if (actor.GetFlagValue("DYNAMICLIGHT.SPOT", false) && dispType < 9840)
dispType += 40; dispType += 40;
return GetLightDataByNum(dispType + baseType); return GetLightDataByNum(dispType + baseType);
} }
else return ld; else return null;
} }
p = p.BaseClass; p = p.BaseClass;
......
...@@ -30,6 +30,6 @@ using CodeImp.DoomBuilder; ...@@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.3.0.2995")] [assembly: AssemblyVersion("2.3.0.3000")]
[assembly: NeutralResourcesLanguageAttribute("en")] [assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("d8bee55")] [assembly: AssemblyHash("5791171")]
...@@ -29,5 +29,5 @@ using System.Resources; ...@@ -29,5 +29,5 @@ using System.Resources;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.3.0.2995")] [assembly: AssemblyVersion("2.3.0.3000")]
[assembly: NeutralResourcesLanguageAttribute("en")] [assembly: NeutralResourcesLanguageAttribute("en")]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment