Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00
parent aa6aa20ba5
commit 65e38b0694
53 changed files with 369 additions and 346 deletions
@@ -7,7 +7,7 @@ MTGGamePhase::MTGGamePhase(int id) :
 {
    animation = 0;
    currentState = -1;
-    mFont = resources.GetWFont(Fonts::MAIN_FONT);
+    mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
    mFont->SetBase(0); // using 2nd font
 }