Merge pull request #2410 from Capostrophic/repairedonme

"Handle" RepairedOnMe scripting function (feature #4255)

CHANGELOG.md

@@ -106,6 +106,7 @@
     Feature #3999: Shift + Double Click should maximize/restore menu size
     Feature #4001: Toggle sneak controller shortcut
     Feature #4209: Editor: Faction rank sub-table
+    Feature #4255: Handle broken RepairedOnMe script function
     Feature #4316: Implement RaiseRank/LowerRank functions properly
     Feature #4360: Improve default controller bindings
     Feature #4673: Weapon sheathing

apps/openmw/mwscript/docs/vmformat.txt

@@ -459,5 +459,7 @@ op 0x2000308: ToggleNavMesh
 op 0x2000309: ToggleActorsPaths
 op 0x200030a: SetNavMeshNumber
 op 0x200030b: Journal, explicit
+op 0x200030c: RepairedOnMe
+op 0x200030d: RepairedOnMe, explicit
 
 opcodes 0x200030c-0x3ffffff unused

apps/openmw/mwscript/miscextensions.cpp

@@ -1398,6 +1398,18 @@ namespace MWScript
                 }
         };
 
+        template <class R>
+        class OpRepairedOnMe : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    // Broken in vanilla and deliberately no-op.
+                    runtime.push(0);
+                }
+        };
+
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5 (Compiler::Misc::opcodeXBox, new OpXBox);
@@ -1501,6 +1513,8 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Misc::opcodeToggleNavMesh, new OpToggleNavMesh);
             interpreter.installSegment5 (Compiler::Misc::opcodeToggleActorsPaths, new OpToggleActorsPaths);
             interpreter.installSegment5 (Compiler::Misc::opcodeSetNavMeshNumberToRender, new OpSetNavMeshNumberToRender);
+            interpreter.installSegment5 (Compiler::Misc::opcodeRepairedOnMe, new OpRepairedOnMe<ImplicitRef>);
+            interpreter.installSegment5 (Compiler::Misc::opcodeRepairedOnMeExplicit, new OpRepairedOnMe<ExplicitRef>);
         }
     }
 }

components/compiler/extensions0.cpp

@@ -324,6 +324,7 @@ namespace Compiler
             extensions.registerInstruction ("tap", "", opcodeToggleActorsPaths);
             extensions.registerInstruction ("toggleactorspaths", "", opcodeToggleActorsPaths);
             extensions.registerInstruction ("setnavmeshnumber", "l", opcodeSetNavMeshNumberToRender);
+            extensions.registerFunction ("repairedonme", 'l', "S", opcodeRepairedOnMe, opcodeRepairedOnMeExplicit);
         }
     }
 

components/compiler/opcodes.hpp

@@ -300,6 +300,8 @@ namespace Compiler
         const int opcodeToggleNavMesh = 0x2000308;
         const int opcodeToggleActorsPaths = 0x2000309;
         const int opcodeSetNavMeshNumberToRender = 0x200030a;
+        const int opcodeRepairedOnMe = 0x200030c;
+        const int opcodeRepairedOnMeExplicit = 0x200030d;
     }
 
     namespace Sky