From a9825f92ee69cb0f80ba32ea31141c45798bf4de Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 18 Jul 2010 19:54:56 +0200
Subject: [PATCH] moved installOpcodes function from scriptmanager to
 extensions

---
 apps/openmw/mwscript/extensions.cpp    | 13 +++++++++++++
 apps/openmw/mwscript/extensions.hpp    |  7 +++++++
 apps/openmw/mwscript/scriptmanager.cpp | 17 +----------------
 apps/openmw/mwscript/scriptmanager.hpp |  2 --
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwscript/extensions.cpp b/apps/openmw/mwscript/extensions.cpp
index 3d6566d62..94f553b58 100644
--- a/apps/openmw/mwscript/extensions.cpp
+++ b/apps/openmw/mwscript/extensions.cpp
@@ -1,6 +1,9 @@
 
 #include "extensions.hpp"
 
+#include <components/interpreter/interpreter.hpp>
+#include <components/interpreter/installopcodes.hpp>
+
 #include "soundextensions.hpp"
 #include "cellextensions.hpp"
 #include "miscextensions.hpp"
@@ -17,5 +20,15 @@ namespace MWScript
         Sound::registerExtensions (extensions);
         Sky::registerExtensions (extensions);
     }
+    
+    void installOpcodes (Interpreter::Interpreter& interpreter)
+    {
+        Interpreter::installOpcodes (interpreter);
+        Cell::installOpcodes (interpreter);
+        Misc::installOpcodes (interpreter);
+        Gui::installOpcodes (interpreter);
+        Sound::installOpcodes (interpreter);
+        Sky::installOpcodes (interpreter);
+    }    
 }
 
diff --git a/apps/openmw/mwscript/extensions.hpp b/apps/openmw/mwscript/extensions.hpp
index a38da0340..9738367a0 100644
--- a/apps/openmw/mwscript/extensions.hpp
+++ b/apps/openmw/mwscript/extensions.hpp
@@ -6,9 +6,16 @@ namespace Compiler
     class Extensions;
 }
 
+namespace Interpreter
+{
+    class Interpreter;
+}
+
 namespace MWScript
 {
     void registerExtensions (Compiler::Extensions& extensions);
+    
+    void installOpcodes (Interpreter::Interpreter& interpreter);
 }
 
 #endif
diff --git a/apps/openmw/mwscript/scriptmanager.cpp b/apps/openmw/mwscript/scriptmanager.cpp
index d9bbc62c1..542bee1fb 100644
--- a/apps/openmw/mwscript/scriptmanager.cpp
+++ b/apps/openmw/mwscript/scriptmanager.cpp
@@ -12,14 +12,9 @@
 #include <components/compiler/scanner.hpp>
 #include <components/compiler/context.hpp>
 
-#include <components/interpreter/installopcodes.hpp>
 #include <components/interpreter/interpreter.hpp>
 
-#include "soundextensions.hpp"
-#include "cellextensions.hpp"
-#include "miscextensions.hpp"
-#include "guiextensions.hpp"
-#include "skyextensions.hpp"
+#include "extensions.hpp"
 
 namespace MWScript
 {
@@ -118,15 +113,5 @@ namespace MWScript
                 iter->second.clear(); // don't execute again.
             }
     }
-    
-    void ScriptManager::installOpcodes (Interpreter::Interpreter& interpreter)
-    {
-        Interpreter::installOpcodes (interpreter);
-        Cell::installOpcodes (interpreter);
-        Misc::installOpcodes (interpreter);
-        Gui::installOpcodes (interpreter);
-        Sound::installOpcodes (interpreter);
-        Sky::installOpcodes (interpreter);
-    }
 }
 
diff --git a/apps/openmw/mwscript/scriptmanager.hpp b/apps/openmw/mwscript/scriptmanager.hpp
index 17b8cc242..5828fbcca 100644
--- a/apps/openmw/mwscript/scriptmanager.hpp
+++ b/apps/openmw/mwscript/scriptmanager.hpp
@@ -46,8 +46,6 @@ namespace MWScript
                 Compiler::Context& compilerContext);
             
             void run (const std::string& name, Interpreter::Context& interpreterContext);
-            
-            static void installOpcodes (Interpreter::Interpreter& interpreter);
     };
 };