zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed parsing of 'damage' default property.

Browse source 
- fixed processing of goto labels.
This commit is contained in:
Christoph Oelckers 2016-10-13 22:52:31 +02:00
parent 433bf46010
commit 7e8d7eb2ec
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/scripting/zscript/zcc_compile.cpp
View file

@ -1575,8 +1575,13 @@ void ZCCCompiler::DispatchProperty(FPropertyInfo *prop, ZCC_PropertyStmt *proper
switch ((*p) & 223) switch ((*p) & 223)
{ {
case 'I':
case 'X': // Expression in parentheses or number. We only support the constant here. The function will have to be handled by a separate property to get past the parser. case 'X': // Expression in parentheses or number. We only support the constant here. The function will have to be handled by a separate property to get past the parser.
conv.i = GetInt(exp);
params.Push(conv);
conv.exp = nullptr;
break;
case 'I':
case 'M': // special case for morph styles in DECORATE . This expression-aware parser will not need this. case 'M': // special case for morph styles in DECORATE . This expression-aware parser will not need this.
case 'N': // special case for thing activations in DECORATE. This expression-aware parser will not need this. case 'N': // special case for thing activations in DECORATE. This expression-aware parser will not need this.
conv.i = GetInt(exp); conv.i = GetInt(exp);
@ -2188,7 +2193,7 @@ void ZCCCompiler::CompileStates()
auto part = sg->Label; auto part = sg->Label;
do do
{ {
statename << part->Id << '.'; statename << FName(part->Id) << '.';
part = static_cast<decltype(part)>(part->SiblingNext); part = static_cast<decltype(part)>(part->SiblingNext);
} while (part != sg->Label); } while (part != sg->Label);
statename.Truncate((long)statename.Len() - 1); // remove the last '.' in the label name statename.Truncate((long)statename.Len() - 1); // remove the last '.' in the label name