stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 22:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

MODELDEF parser: fixed a crash when trying to add a model definition when another one was already created for the same actor.

Browse source 
ZDoom_DECORATE.cfg: added A_SetSpeed definition.
This commit is contained in:
MaxED 2014-09-22 00:16:42 +00:00
parent 786caf3b34
commit e6b997a7da
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Build/Scripting/ZDoom_DECORATE.cfg
View file

@ -167,6 +167,7 @@ keywords
A_SetShootable = "A_SetShootable";
A_SetSolid = "A_SetSolid";
A_SetSpecial = "A_SetSpecial(int special, int arg0, int arg1, int arg2, int arg3, int arg4)";
A_SetSpeed = "A_SetSpeed(float speed)";
A_SetTics = "A_SetTics(int tics)";
A_SetTranslucent = "A_SetTranslucent(float alpha, int mode)";
A_SetUserVar = "A_SetUserVar(string name, int value)";

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

@ -1492,7 +1492,13 @@ namespace CodeImp.DoomBuilder.Data
// Parse the data
if(parser.Parse(group.Value, currentreader.Location.location + "\\" + group.Key)) {
foreach(KeyValuePair<string, ModelData> g in parser.Entries) {
modelDefEntriesByName.Add(g.Key, g.Value);
if (modelDefEntriesByName.ContainsKey(g.Key)) {
General.ErrorLogger.Add(ErrorType.Warning, "Model definition for actor '" + g.Key + "' is double-defined in '" + group.Key + "'");
modelDefEntriesByName[g.Key] = g.Value;
} else {
modelDefEntriesByName.Add(g.Key, g.Value);
}
}
}
}