zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-19 16:11:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- silence all error messages in the state map parser for DEHSUPP when re-reading the data.

Browse source 
The state map will just be skipped and the parser only needs to run to get over the data.
However, due to changes from a previous patch the data cannot be validated so aside from not using the data it may also not abort on errors.
This commit is contained in:
Christoph Oelckers 2018-02-27 11:34:44 +01:00
parent f3deaf54c6
commit d873ae75ab
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_dehacked.cpp
View file

@ -2840,14 +2840,14 @@ static bool LoadDehSupp ()
sc.MustGetString(); sc.MustGetString();
PClassActor *actortype = static_cast<PClassActor *>(type); PClassActor *actortype = static_cast<PClassActor *>(type);
s.State = actortype->FindState(sc.String); s.State = actortype->FindState(sc.String);
if (s.State == NULL) if (s.State == NULL && addit)
{ {
sc.ScriptError("Invalid state '%s' in '%s'", sc.String, type->TypeName.GetChars()); sc.ScriptError("Invalid state '%s' in '%s'", sc.String, type->TypeName.GetChars());
} }
sc.MustGetStringName(","); sc.MustGetStringName(",");
sc.MustGetNumber(); sc.MustGetNumber();
if (s.State == NULL || sc.Number < 1 || !actortype->OwnsState(s.State + sc.Number - 1)) if (addit && (s.State == NULL || sc.Number < 1 || !actortype->OwnsState(s.State + sc.Number - 1)))
{ {
sc.ScriptError("Invalid state range in '%s'", type->TypeName.GetChars()); sc.ScriptError("Invalid state range in '%s'", type->TypeName.GetChars());
} }