Changeset 5875

Timestamp:

Oct 4, 2009, 11:05:17 PM (15 years ago)

Author:

rgrieder

Message:

Fixed an issue that could occur when singletons associated with ScopeID::Graphics (indirectly) asked for GameMode::showsGraphics.

Location:

code/branches/core5/src/libraries/core

Files:

• Core.cc (modified) (2 diffs)
• Game.cc (modified) (3 diffs)
• GameMode.h (modified) (1 diff)

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

@@ -293 +293 @@
             inputManager_->getMousePosition(), graphicsManager_->isFullScreen()));
 
+        bGraphicsLoaded_ = true;
+        GameMode::bShowsGraphics_s = true;
+
         // Create singletons associated with graphics (in other libraries)
         graphicsScope_.reset(new Scope<ScopeID::Graphics>());
 
         unloader.Dismiss();
-
-        bGraphicsLoaded_ = true;
     }
 
@@ -320 +321 @@
 
         bGraphicsLoaded_ = false;
+        GameMode::bShowsGraphics_s = false;
     }
 

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

@@ -523 +523 @@
     void Game::loadGraphics()
     {
-        if (!GameMode::bShowsGraphics_s)
+        if (!GameMode::showsGraphics())
         {
             core_->loadGraphics();
             Loki::ScopeGuard graphicsUnloader = Loki::MakeObjGuard(*this, &Game::unloadGraphics);
-            GameMode::bShowsGraphics_s = true;
 
             // Construct all the GameStates that require graphics
@@ -548 +547 @@
     void Game::unloadGraphics()
     {
-        if (GameMode::bShowsGraphics_s)
+        if (GameMode::showsGraphics())
         {
             // Destroy all the GameStates that require graphics
@@ -560 +559 @@
 
             core_->unloadGraphics();
-            GameMode::bShowsGraphics_s = false;
         }
     }

code/branches/core5/src/libraries/core/GameMode.h

@@ -41 +41 @@
     class _CoreExport GameMode
     {
-        friend class Game;
+        friend class Core;
 
         public: