Allow garbage integer argument for addSpell (Fixes #1539)

components/compiler/exprparser.cpp

@@ -775,7 +775,7 @@ namespace Compiler
             {
                 parser.reset();
 
-                if (optional)
+                if (optional || *iter == 'X')
                     parser.setOptional (true);
 
                 scanner.scan (parser);
@@ -783,17 +783,20 @@ namespace Compiler
                 if (optional && parser.isEmpty())
                     break;
 
-                std::vector<Interpreter::Type_Code> tmp;
+                if (*iter != 'X')
+                {
+                    std::vector<Interpreter::Type_Code> tmp;
 
-                char type = parser.append (tmp);
+                    char type = parser.append (tmp);
 
-                if (type!=*iter)
-                    Generator::convert (tmp, type, *iter);
+                    if (type!=*iter)
+                        Generator::convert (tmp, type, *iter);
 
-                stack.push (tmp);
+                    stack.push (tmp);
 
-                if (optional)
-                    ++optionalCount;
+                    if (optional)
+                        ++optionalCount;
+                }
             }
         }
 

components/compiler/extensions.hpp

@@ -20,7 +20,8 @@ namespace Compiler
         l - Integer <BR>
         s - Short <BR>
         S - String, case preserved <BR>
-        x - Optional, ignored argument
+        x - Optional, ignored string argument
+        X - Optional, ignored integer argument
     **/
     typedef std::string ScriptArgs;
 

components/compiler/extensions0.cpp

@@ -405,7 +405,7 @@ namespace Compiler
             extensions.registerInstruction ("setpccrimelevel", "f", opcodeSetPCCrimeLevel);
             extensions.registerInstruction ("modpccrimelevel", "f", opcodeModPCCrimeLevel);
 
-            extensions.registerInstruction ("addspell", "cx", opcodeAddSpell, opcodeAddSpellExplicit);
+            extensions.registerInstruction ("addspell", "cxX", opcodeAddSpell, opcodeAddSpellExplicit);
             extensions.registerInstruction ("removespell", "c", opcodeRemoveSpell,
                 opcodeRemoveSpellExplicit);
             extensions.registerInstruction ("removespelleffects", "c", opcodeRemoveSpellEffects,