ToggleAI cleanup

apps/openmw/mwscript/aiextensions.cpp

@@ -465,7 +465,6 @@ namespace MWScript
                 }
         };
 
-        template<class R>
         class OpToggleAI : public Interpreter::Opcode0
         {
             public:
@@ -520,8 +519,7 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Ai::opcodeStartCombatExplicit, new OpStartCombat<ExplicitRef>);
             interpreter.installSegment5 (Compiler::Ai::opcodeStopCombat, new OpStopCombat<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Ai::opcodeStopCombatExplicit, new OpStopCombat<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAI, new OpToggleAI<ImplicitRef>);
+            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAI, new OpToggleAI);
-            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAIExplicit, new OpToggleAI<ExplicitRef>);
 
             interpreter.installSegment5 (Compiler::Ai::opcodeSetHello, new OpSetAiSetting<ImplicitRef>(0));
             interpreter.installSegment5 (Compiler::Ai::opcodeSetHelloExplicit, new OpSetAiSetting<ExplicitRef>(0));

apps/openmw/mwscript/docs/vmformat.txt

@@ -364,7 +364,7 @@ op 0x2000221: EnableLevitation
 op 0x2000222: GetLineOfSight
 op 0x2000223: GetLineOfSightExplicit
 op 0x2000224: ToggleAI
-op 0x2000225: ToggleAIExplicit
+op 0x2000225: unused
 op 0x2000226: COE
 op 0x2000227: Cast
 op 0x2000228: Cast, explicit

components/compiler/extensions0.cpp

@@ -59,8 +59,8 @@ namespace Compiler
             extensions.registerInstruction ("modfight", "l", opcodeModFight, opcodeModFightExplicit);
             extensions.registerInstruction ("modflee", "l", opcodeModFlee, opcodeModFleeExplicit);
             extensions.registerInstruction ("modalarm", "l", opcodeModAlarm, opcodeModAlarmExplicit);
-            extensions.registerInstruction ("toggleai", "", opcodeToggleAI, opcodeToggleAI);
+            extensions.registerInstruction ("toggleai", "", opcodeToggleAI);
-            extensions.registerInstruction ("tai", "", opcodeToggleAI, opcodeToggleAI);
+            extensions.registerInstruction ("tai", "", opcodeToggleAI);
             extensions.registerInstruction("startcombat", "c", opcodeStartCombat, opcodeStartCombatExplicit);
             extensions.registerInstruction("stopcombat", "x", opcodeStopCombat, opcodeStopCombatExplicit);
             extensions.registerFunction ("gethello", 'l', "", opcodeGetHello, opcodeGetHelloExplicit);

components/compiler/opcodes.hpp

@@ -52,7 +52,6 @@ namespace Compiler
         const int opcodeGetLineOfSight = 0x2000222;
         const int opcodeGetLineOfSightExplicit = 0x2000223;
         const int opcodeToggleAI = 0x2000224;
-        const int opcodeToggleAIExplicit = 0x2000225;
         const int opcodeGetTarget = 0x2000238;
         const int opcodeGetTargetExplicit = 0x2000239;
         const int opcodeStartCombat = 0x200023a;