Changeset 8423 for code/trunk/src/libraries/core/Game.cc

Timestamp:

May 9, 2011, 5:06:49 AM (13 years ago)

Author:

rgrieder

Message:

Added and incorporated new class DestructionHelper: instead of doing the destruction of certain singletons implicitly via scoped_ptrs and ScopeGuards, use a method named destroy() that essentially achieves the same, but makes the destruction sequence obvious.

File:

• code/trunk/src/libraries/core/Game.cc (modified) (3 diffs)

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

@@ -78 +78 @@
 
     Game::Game(const std::string& cmdLine)
-        // Destroy factories before the Core!
-        : gsFactoryDestroyer_(Game::GameStateFactory::getFactories(), &std::map<std::string, shared_ptr<GameStateFactory> >::clear)
-    {
-        this->bAbort_ = false;
-        bChangingState_ = false;
-
+        : gameClock_(NULL)
+        , core_(NULL)
+        , bChangingState_(false)
+        , bAbort_(false)
+        , destructionHelper_(this)
+    {
 #ifdef ORXONOX_PLATFORM_WINDOWS
         minimumSleepTime_ = 1000/*us*/;
@@ -103 +103 @@
 
         // Set up a basic clock to keep time
-        this->gameClock_.reset(new Clock());
+        this->gameClock_ = new Clock();
 
         // Create the Core
-        this->core_.reset(new Core(cmdLine));
+        this->core_ = new Core(cmdLine);
 
         // Do this after the Core creation!
@@ -127 +127 @@
     }
 
-    /**
-    @brief
-        All destruction code is handled by scoped_ptrs and SimpleScopeGuards.
-    */
-    Game::~Game()
+    void Game::destroy()
     {
         // Remove us from the object lists again to avoid problems when destroying them
         this->unregisterObject();
+
+        assert(loadedStates_.size() <= 1); // Just empty root GameState
+        // Destroy all GameStates (shared_ptrs take care of actual destruction)
+        constructedStates_.clear();
+
+        GameStateFactory::getFactories().clear();
+        safeObjectDelete(&core_);
+        safeObjectDelete(&gameClock_);
     }