Changeset 5875 for code/branches/core5/src/libraries/core/Game.cc

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.

File:

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

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;
         }
     }