diff --git a/Source/Core/Config/ThingTypeInfo.cs b/Source/Core/Config/ThingTypeInfo.cs index 958bc02e159ecdefefb8dee55ba37300bb0aa98a..3271f460ff3071f56758b6e2df7253eedb0a7217 100755 --- a/Source/Core/Config/ThingTypeInfo.cs +++ b/Source/Core/Config/ThingTypeInfo.cs @@ -592,11 +592,11 @@ namespace CodeImp.DoomBuilder.Config if(blocking > THING_BLOCKING_NONE) errorcheck = THING_ERROR_INSIDE_STUCK; // [ZZ] - DynamicLightType = GZGeneral.GetGZLightTypeByClass(actor); - } + dynamiclighttype = GZGeneral.GetGZLightTypeByClass(actor); + } - //mxd. This tries to find all possible sprite rotations. Returns true when voxel substitute exists - internal bool SetupSpriteFrame(HashSet<string> allspritenames, HashSet<string> allvoxelnames) + //mxd. This tries to find all possible sprite rotations. Returns true when voxel substitute exists + internal bool SetupSpriteFrame(HashSet<string> allspritenames, HashSet<string> allvoxelnames) { // Empty, invalid or internal sprites don't have rotations // Info: we can have either partial 5-char sprite name from DECORATE parser, diff --git a/Source/Core/GZBuilder/GZGeneral.cs b/Source/Core/GZBuilder/GZGeneral.cs index ae43a731963a5f4cefd99e2cec16cf55c166e844..645557d54deaa5dfaeee3371f567925414073bbd 100755 --- a/Source/Core/GZBuilder/GZGeneral.cs +++ b/Source/Core/GZBuilder/GZGeneral.cs @@ -50,17 +50,17 @@ namespace CodeImp.DoomBuilder.GZBuilder while (p != null) { idx = Array.IndexOf(gzLightClasses, p.ClassName.ToLowerInvariant()); - if (idx != -1) { // found dynamic light type. alter it by actor flags. // +MISSILEMORE makes it additive. // +MISSILEEVENMORE makes it subtractive. // +INCOMBAT makes it attenuated. + int light = gzLights[idx]; if (idx < GZ_LIGHT_TYPES[3]) { - int baseType = idx % 10; - int dispType = idx - 9800 - baseType; + int baseType = light % 10; + int dispType = light - baseType; if (actor.GetFlagValue("MISSILEMORE", false)) dispType = 9810; else if (actor.GetFlagValue("MISSILEEVENMORE", false)) @@ -69,7 +69,7 @@ namespace CodeImp.DoomBuilder.GZBuilder dispType = 9830; return dispType + baseType; } - else return gzLights[idx]; + else return light; } p = p.BaseClass; diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs index f6d5a2f3eaa87e91120e2ba0deb50fcb3cc33a51..cdd7530c5bbf5edfe591882ec08cf1af411258b1 100755 --- a/Source/Core/Properties/AssemblyInfo.cs +++ b/Source/Core/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using CodeImp.DoomBuilder; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.2923")] +[assembly: AssemblyVersion("2.3.0.2924")] [assembly: NeutralResourcesLanguageAttribute("en")] -[assembly: AssemblyHash("748fe9e")] +[assembly: AssemblyHash("6108502")] diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs index 9490b5780fbbcf32e925c30952fb282942e94b57..f0cff6afde4adde7f9c97f757b955d884a2238d3 100755 --- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs +++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Resources; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.2923")] +[assembly: AssemblyVersion("2.3.0.2924")] [assembly: NeutralResourcesLanguageAttribute("en")]