Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

allow additional string argument for stopcombat and addspell (ignored)

Browse source
This commit is contained in:
Marc Zinnschlag 2014-02-12 08:53:37 +01:00
parent 6a5d88b640
commit 61626e90da
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/compiler/exprparser.cpp
View file

@ -705,11 +705,11 @@ namespace Compiler
{
optional = true;
}
else if (*iter=='S' || *iter=='c')
else if (*iter=='S' || *iter=='c' || *iter=='x')
{
stringParser.reset();
if (optional)
if (optional || *iter=='x')
stringParser.setOptional (true);
if (*iter=='c') stringParser.smashCase();
@ -718,18 +718,21 @@ namespace Compiler
if (optional && stringParser.isEmpty())
break;
if (invert)
if (*iter!='x')
{
std::vector<Interpreter::Type_Code> tmp;
stringParser.append (tmp);
if (invert)
{
std::vector<Interpreter::Type_Code> tmp;
stringParser.append (tmp);
stack.push (tmp);
stack.push (tmp);
}
else
stringParser.append (code);
if (optional)
++optionalCount;
}
else
stringParser.append (code);
if (optional)
++optionalCount;
}
else
{