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

DECORATE/ZScript: fixed an crash introduced in 070aa9f36f that happened when a base actor didn't have a thing type info

Browse source
This commit is contained in:
biwa 2022-05-14 18:07:50 +02:00
parent 070aa9f36f
commit d08bc4438b
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/Data/DataManager.cs
View file

@ -1872,7 +1872,6 @@ namespace CodeImp.DoomBuilder.Data
// Step 1. Go for all actors in the decorate to make things or update things
foreach (ActorStructure actor in mergedActors)
{
Console.WriteLine(actor.ClassName);
//mxd. Apply "replaces" DECORATE override...
if (!string.IsNullOrEmpty(actor.ReplacesClass) && thingtypesbyclass.ContainsKey(actor.ReplacesClass))
{
@ -1908,7 +1907,7 @@ namespace CodeImp.DoomBuilder.Data
// If the thing inherits from another actor use the base actor's thing type info, otherwise create a new one
// This makes sure that inherited actors get all properties like the icon color
if (!string.IsNullOrEmpty(actor.InheritsClass))
if (!string.IsNullOrEmpty(actor.InheritsClass) && thingtypesbyclass.ContainsKey(actor.InheritsClass))
t = new ThingTypeInfo(cat, actor, thingtypesbyclass[actor.InheritsClass]);
else
t = new ThingTypeInfo(cat, actor);