From 61626e90da98641db5da0e33457977311ec30c6f Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 12 Feb 2014 08:53:37 +0100
Subject: [PATCH] allow additional string argument for stopcombat and addspell
 (ignored)

---
 components/compiler/exprparser.cpp  | 25 ++++++++++++++-----------
 components/compiler/exprparser.hpp  |  1 +
 components/compiler/extensions0.cpp |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 283da854c9..4af11ec2be 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -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
             {
diff --git a/components/compiler/exprparser.hpp b/components/compiler/exprparser.hpp
index 8ce5409d23..905f0d454f 100644
--- a/components/compiler/exprparser.hpp
+++ b/components/compiler/exprparser.hpp
@@ -101,6 +101,7 @@ namespace Compiler
             /// \param arguments Each character represents one arguments ('l': integer,
             /// 'f': float, 'S': string, 'c': string (case smashed), '/': following arguments are
             /// optional)
+            /// 'x': optional string that will be ignored (die in a fire, MW script compiler!)
             /// \param invert Store arguments in reverted order.
             /// \return number of optional arguments
     };
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index ebe46d2826..53f1baaf9d 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -62,7 +62,7 @@ namespace Compiler
             extensions.registerInstruction ("toggleai", "", opcodeToggleAI, opcodeToggleAI);
             extensions.registerInstruction ("tai", "", opcodeToggleAI, opcodeToggleAI);
             extensions.registerInstruction("startcombat", "c", opcodeStartCombat, opcodeStartCombatExplicit);
-            extensions.registerInstruction("stopcombat", "", opcodeStopCombat, opcodeStopCombatExplicit);
+            extensions.registerInstruction("stopcombat", "x", opcodeStopCombat, opcodeStopCombatExplicit);
             extensions.registerFunction ("gethello", 'l', "", opcodeGetHello, opcodeGetHelloExplicit);
             extensions.registerFunction ("getfight", 'l', "", opcodeGetFight, opcodeGetFightExplicit);
             extensions.registerFunction ("getflee", 'l', "", opcodeGetFlee, opcodeGetFleeExplicit);
@@ -398,7 +398,7 @@ namespace Compiler
             extensions.registerInstruction ("setpccrimelevel", "f", opcodeSetPCCrimeLevel);
             extensions.registerInstruction ("modpccrimelevel", "f", opcodeModPCCrimeLevel);
 
-            extensions.registerInstruction ("addspell", "c", opcodeAddSpell, opcodeAddSpellExplicit);
+            extensions.registerInstruction ("addspell", "cx", opcodeAddSpell, opcodeAddSpellExplicit);
             extensions.registerInstruction ("removespell", "c", opcodeRemoveSpell,
                 opcodeRemoveSpellExplicit);
             extensions.registerInstruction ("removespelleffects", "c", opcodeRemoveSpellEffects,