mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-05-31 09:01:22 +00:00
Fixed, MAPINFO parser: the parser was unable to handle DoomEdNum block's action special definitions.
Fixed, DoomEdNum handling: in some cases ThingTypeInfo was not assigned a proper DoomEdNum and was not placed in a ThingCategory.
This commit is contained in:
parent
60c4ad7b4b
commit
f30c1ba0c6
4 changed files with 58 additions and 26 deletions
|
@ -1432,18 +1432,15 @@ namespace CodeImp.DoomBuilder.Data
|
|||
// Try to find the actor...
|
||||
ActorStructure actor = null;
|
||||
|
||||
if(!decorate.HasError)
|
||||
//... in ActorsByClass
|
||||
if(decorate.ActorsByClass.ContainsKey(group.Value))
|
||||
{
|
||||
//... in ActorsByClass
|
||||
if(decorate.ActorsByClass.ContainsKey(group.Value))
|
||||
{
|
||||
actor = decorate.ActorsByClass[group.Value];
|
||||
}
|
||||
// Try finding in ArchivedActors
|
||||
else if(decorate.AllActorsByClass.ContainsKey(group.Value))
|
||||
{
|
||||
actor = decorate.AllActorsByClass[group.Value];
|
||||
}
|
||||
actor = decorate.ActorsByClass[group.Value];
|
||||
}
|
||||
// Try finding in ArchivedActors
|
||||
else if(decorate.AllActorsByClass.ContainsKey(group.Value))
|
||||
{
|
||||
actor = decorate.AllActorsByClass[group.Value];
|
||||
}
|
||||
|
||||
if(actor != null)
|
||||
|
@ -1454,8 +1451,9 @@ namespace CodeImp.DoomBuilder.Data
|
|||
ThingCategory cat = GetThingCategory(actor, catname);
|
||||
|
||||
// Add a new ThingTypeInfo, replacing already existing one if necessary
|
||||
ThingTypeInfo info = new ThingTypeInfo(cat, actor);
|
||||
ThingTypeInfo info = new ThingTypeInfo(cat, actor, group.Key);
|
||||
thingtypes[group.Key] = info;
|
||||
cat.AddThing(info);
|
||||
}
|
||||
// Check thingtypes...
|
||||
else if(thingtypesbyclass.ContainsKey(group.Value))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue