Issue #19: Moved code from Engine to WindowManager and ScriptManager

apps/openmw/engine.cpp

@@ -319,12 +319,6 @@ void OMW::Engine::go()
     mGuiManager = new OEngine::GUI::MyGUIManager(mOgre.getWindow(), mOgre.getScene(), false,
         mCfgMgr.getLogPath().string() + std::string("/"));
 
-    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSkill>("Widget");
-    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWAttribute>("Widget");
-    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSpell>("Widget");
-    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSpellEffect>("Widget");
-    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWDynamicStat>("Widget");
-
     // Create window manager - this manages all the MW-specific GUI windows
     MWScript::registerExtensions (mExtensions);
 
@@ -383,29 +377,19 @@ void OMW::Engine::go()
     mOgre.getRoot()->addFrameListener (this);
 
     // Play some good 'ol tunes
-      mEnvironment.mSoundManager->startRandomTitle();
+    mEnvironment.mSoundManager->startRandomTitle();
 
     // scripts
     if (mCompileAll)
     {
-        typedef ESMS::ScriptListT<ESM::Script>::MapType Container;
-
-        Container scripts = mEnvironment.mWorld->getStore().scripts.list;
-
-        int count = 0;
-        int success = 0;
+        std::pair<int, int> result = mScriptManager->compileAll();
 
-        for (Container::const_iterator iter (scripts.begin()); iter!=scripts.end(); ++iter, ++count)
-            if (mScriptManager->compile (iter->first))
-                ++success;
-
-        if (count)
+        if (result.first)
             std::cout
-                << "compiled " << success << " of " << count << " scripts ("
-                << 100*static_cast<double> (success)/count
+                << "compiled " << result.second << " of " << result.first << " scripts ("
+                << 100*static_cast<double> (result.second)/result.first
                 << "%)"
                 << std::endl;
-
     }
 
     // Start the main rendering loop

apps/openmw/mwgui/window_manager.cpp

@@ -77,6 +77,12 @@ WindowManager::WindowManager(MyGUI::Gui *_gui, MWWorld::Environment& environment
         playerSkillValues.insert(std::make_pair(ESM::Skill::skillIds[i], MWMechanics::Stat<float>()));
     }
 
+    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSkill>("Widget");
+    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWAttribute>("Widget");
+    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSpell>("Widget");
+    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSpellEffect>("Widget");
+    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWDynamicStat>("Widget");
+
     // Set up visibility
     updateVisible();
 }
@@ -329,7 +335,7 @@ void WindowManager::updateVisible()
         dialogueWindow->open();
         return;
     }
-    
+
     if(mode == GM_InterMessageBox)
     {
         if(!mMessageBoxManager->isInteractiveMessageBox()) {

apps/openmw/mwscript/scriptmanager.cpp

@@ -116,4 +116,20 @@ namespace MWScript
                 iter->second.clear(); // don't execute again.
             }
     }
+
+    std::pair<int, int> ScriptManager::compileAll()
+    {
+        typedef ESMS::ScriptListT<ESM::Script>::MapType Container;
+
+        const Container& scripts = mStore.scripts.list;
+
+        int count = 0;
+        int success = 0;
+
+        for (Container::const_iterator iter (scripts.begin()); iter!=scripts.end(); ++iter, ++count)
+            if (compile (iter->first))
+                ++success;
+
+        return std::make_pair (count, success);
+    }
 }

apps/openmw/mwscript/scriptmanager.hpp

@@ -52,6 +52,10 @@ namespace MWScript
             bool compile (const std::string& name);
             ///< Compile script with the given namen
             /// \return Success?
+
+            std::pair<int, int> compileAll();
+            ///< Compile all scripts
+            /// \return count, success
     };
 };