Changeset 5637

Timestamp:

Aug 12, 2009, 5:06:34 PM (15 years ago)

Author:

landauf

Message:

Applied retos patch for Game.cc and Game.h (thanks)

+2 small changes in Core.cc and GSClient.cc

Location:

code/branches/libraries/src

Files:

• core/Core.cc (modified) (1 diff)
• core/Game.cc (modified) (1 diff)
• core/Game.h (modified) (5 diffs)
• orxonox/gamestates/GSClient.cc (modified) (1 diff)

code/branches/libraries/src/core/Core.cc

@@ -299 +299 @@
                         boost::filesystem::path librarypath = searchpath / library;
 
-                        this->dynLibManager_->load(librarypath.string());
+                        DynLibManager::getInstance().load(librarypath.string());
                     }
                 }

code/branches/libraries/src/core/Game.cc

@@ -113 +113 @@
     */
     Game::Game(const std::string& cmdLine)
+        // Destroy factories before the Core!
+        : gsFactoryDestroyer_(Game::GameStateFactory::factories_s, &std::map<std::string, shared_ptr<GameStateFactory> >::clear)
     {
         this->bAbort_ = false;

code/branches/libraries/src/core/Game.h

@@ -48 +48 @@
 
 #include "util/Debug.h"
+#include "util/ScopeGuard.h"
 #include "util/Singleton.h"
 
@@ -85 +86 @@
         typedef std::map<std::string, shared_ptr<GameState> > GameStateMap;
         typedef boost::shared_ptr<GameStateTreeNode> GameStateTreeNodePtr;
+
     public:
         Game(const std::string& cmdLine);
@@ -118 +120 @@
             static void createFactory(const std::string& className)
                 { factories_s[className].reset(new TemplateGameStateFactory<T>()); }
-        private:
+
             virtual shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) = 0;
             static std::map<std::string, shared_ptr<GameStateFactory> > factories_s;
@@ -129 +131 @@
                 { return shared_ptr<GameState>(new T(info)); }
         };
+        // For the factory destruction
+        typedef Loki::ObjScopeGuardImpl0<std::map<std::string, shared_ptr<GameStateFactory> >, void (std::map<std::string, shared_ptr<GameStateFactory> >::*)()> ObjScopeGuard;
 
         struct StatisticsTickInfo
@@ -156 +160 @@
         scoped_ptr<Clock>                  gameClock_;
         scoped_ptr<Core>                   core_;
+        ObjScopeGuard                      gsFactoryDestroyer_;
         scoped_ptr<GameConfiguration>      configuration_;
 

code/branches/libraries/src/orxonox/gamestates/GSClient.cc

@@ -40 +40 @@
     DeclareGameState(GSClient, "client", false, true);
 
-    SetCommandLineArgument(ip, "127.0.0.1").information("Sever IP as strin in the form #.#.#.#");
+    SetCommandLineArgument(ip, "127.0.0.1").information("Sever IP as string in the form #.#.#.#");
 
     GSClient::GSClient(const GameStateInfo& info)