stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-17 01:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-fixed: fixed a crash when determining sprite angles when there was more than one sprite for the same frame and angle.

Browse source
This commit is contained in:
MaxED 2016-04-10 21:16:42 +00:00
parent 8bac02ed14
commit fd2aae7483
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Source/Core/Config/ThingTypeInfo.cs
View file

@ -580,12 +580,17 @@ namespace CodeImp.DoomBuilder.Config
// Even more sanity checks // Even more sanity checks
if(!string.IsNullOrEmpty(frames[targetangle - 1])) if(!string.IsNullOrEmpty(frames[targetangle - 1]))
General.ErrorLogger.Add(ErrorType.Warning, "Warning in actor \"" + title + "\":" + index + ". Sprite \"" + sourcename + "\", frame " + targetframe + ", angle " + targetangle + " is double-defined"); {
General.ErrorLogger.Add(ErrorType.Warning, "Warning in actor \"" + title + "\":" + index
+ ". Sprite \"" + sourcename + "\", frame " + targetframe + ", angle " + targetangle
+ " is double-defined in sprites \"" + frames[targetangle - 1] + "\" and \"" + s + "\"");
}
else else
{
// Add to collection
frames[targetangle - 1] = s;
processedcount++; processedcount++;
}
// Add to collection
frames[targetangle - 1] = s;
} }
// Check second frame block? // Check second frame block?
@ -619,13 +624,18 @@ namespace CodeImp.DoomBuilder.Config
// Even more sanity checks // Even more sanity checks
if(!string.IsNullOrEmpty(frames[targetangle - 1])) if(!string.IsNullOrEmpty(frames[targetangle - 1]))
General.ErrorLogger.Add(ErrorType.Warning, "Warning in actor \"" + title + "\":" + index + ". Sprite \"" + sourcename + "\", frame " + targetframe + ", angle " + targetangle + " is double-defined"); {
General.ErrorLogger.Add(ErrorType.Warning, "Warning in actor \"" + title + "\":" + index
+ ". Sprite \"" + sourcename + "\", frame " + targetframe + ", angle " + targetangle
+ " is double-defined in sprites \"" + frames[targetangle - 1] + "\" and \"" + s + "\"");
}
else else
{
// Add to collections
frames[targetangle - 1] = s;
mirror[targetangle - 1] = true;
processedcount++; processedcount++;
}
// Add to collections
frames[targetangle - 1] = s;
mirror[targetangle - 1] = true;
} }
// Gathered all sprites? // Gathered all sprites?