From 8c36eafbffa8c567927a07f7e582c22ab942ed38 Mon Sep 17 00:00:00 2001
From: ZZYZX <zzyzx@virtual>
Date: Sat, 4 Mar 2017 16:50:46 +0200
Subject: [PATCH] Fixed state lookup logic for sprite guessing; it should
always prefer SPRITE_CHECK_STATES to using the random first frame.
---
Source/Core/Properties/AssemblyInfo.cs | 4 ++--
Source/Core/ZDoom/ActorStructure.cs | 2 +-
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs
index c3cc42265..eb01b45bf 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.2928")]
+[assembly: AssemblyVersion("2.3.0.2929")]
[assembly: NeutralResourcesLanguageAttribute("en")]
-[assembly: AssemblyHash("4b1a31c")]
+[assembly: AssemblyHash("522c1e3")]
diff --git a/Source/Core/ZDoom/ActorStructure.cs b/Source/Core/ZDoom/ActorStructure.cs
index 169ffe9d9..fc6bb68c8 100755
--- a/Source/Core/ZDoom/ActorStructure.cs
+++ b/Source/Core/ZDoom/ActorStructure.cs
@@ -338,7 +338,7 @@ namespace CodeImp.DoomBuilder.ZDoom
}
// [ZZ] return whatever is there by priority. try to pick non-TNT1 frames.
- StateStructure.FrameInfo[] infos = new StateStructure.FrameInfo[] { lastNonTntInfo, firstNonTntInfo, lastInfo, firstInfo };
+ StateStructure.FrameInfo[] infos = new StateStructure.FrameInfo[] { lastNonTntInfo, lastInfo, firstNonTntInfo, firstInfo };
foreach (StateStructure.FrameInfo info in infos)
if (info != null) return info;
diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
index a61a18da1..cc2e01ebb 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.2928")]
+[assembly: AssemblyVersion("2.3.0.2929")]
[assembly: NeutralResourcesLanguageAttribute("en")]
--
GitLab