zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 05:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed crash on message output during decorate parsing

Browse source 
Script position is now initialized at the very beginning of decorate parsing process
Script position no longer contains uninitialized file name

https://forum.zdoom.org/viewtopic.php?t=64836
This commit is contained in:
alexey.lysiuk 2019-05-28 18:13:34 +03:00
parent 8127af1082
commit 677b24b108
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/scripting/decorate/thingdef_parse.cpp
View file

@ -1148,6 +1148,7 @@ static void ParseActor(FScanner &sc, PNamespace *ns)
bag.Namespace = ns;
bag.Version = { 2, 0, 0 };
bag.fromDecorate = true;
bag.ScriptPosition = sc;
info = ParseActorHeader(sc, &bag);
sc.MustGetToken('{');
while (sc.MustGetAnyToken(), sc.TokenType != '}')

7
src/utility/sc_man.cpp
View file

@ -1173,6 +1173,13 @@ FScriptPosition &FScriptPosition::operator=(const FScriptPosition &other)
return *this;
}
FScriptPosition &FScriptPosition::operator=(FScanner &sc)
{
FileName = sc.ScriptName;
ScriptLine = sc.GetMessageLine();
return *this;
}
//==========================================================================
//
// FScriptPosition::Message

2
src/utility/sc_man.h
View file

@ -169,12 +169,14 @@ struct FScriptPosition
FScriptPosition()
{
FileName = NAME_None;
ScriptLine=0;
}
FScriptPosition(const FScriptPosition &other);
FScriptPosition(FString fname, int line);
FScriptPosition(FScanner &sc);
FScriptPosition &operator=(const FScriptPosition &other);
FScriptPosition &operator=(FScanner &sc);
void Message(int severity, const char *message,...) const GCCPRINTF(3,4);
static void ResetErrorCounter()
{