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

Timestamp:

May 9, 2011, 5:06:49 AM (14 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.h (modified) (6 diffs)

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

@@ -45 +45 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <boost/preprocessor/cat.hpp>
-#include <loki/ScopeGuard.h>
 
 #include "util/Debug.h"
+#include "util/DestructionHelper.h"
 #include "util/Singleton.h"
 #include "OrxonoxClass.h"
@@ -56 +55 @@
 @brief
     Adds a new GameState to the Game. The second parameter is the name as string
-    and every following paramter is a constructor argument (which is usually non existent)
+    and every following parameter is a constructor argument (which is usually non existent)
 */
 #define DeclareGameState(className, stateName, bIgnoreTickTime, bGraphicsMode) \
@@ -92 +91 @@
     public:
         Game(const std::string& cmdLine);
-        ~Game();
+
+        //! Leave empty and use cleanup() instead
+        ~Game() {}
+        /// Destructor that also executes when object fails to construct
+        void destroy();
 
         void setConfigValues();
@@ -138 +141 @@
                 { 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
@@ -166 +167 @@
         void resetChangingState() { this->bChangingState_ = false; }
 
-        scoped_ptr<Clock>                  gameClock_;
-        scoped_ptr<Core>                   core_;
-        ObjScopeGuard                      gsFactoryDestroyer_;
+        Clock*                             gameClock_;
+        Core*                              core_;
 
         GameStateMap                       constructedStates_;
@@ -194 +194 @@
         unsigned int                       fpsLimit_;
 
+        /// Helper object that executes the surrogate destructor destroy()
+        DestructionHelper<Game>            destructionHelper_;
+
         static std::map<std::string, GameStateInfo> gameStateDeclarations_s;
         static Game* singletonPtr_s;        //!< Pointer to the Singleton