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.

This commit is contained in:
wrenczes@gmail.com
2010-12-01 08:22:17 +00:00
parent aa6aa20ba5
commit 65e38b0694
53 changed files with 369 additions and 346 deletions

View File

@@ -20,11 +20,11 @@ void GuiBackground::Render()
GameObserver * go = GameObserver::GetInstance();
if (go && go->mRules && go->mRules->bg.size())
{
quad = resources.RetrieveTempQuad(go->mRules->bg);
quad = WResourceManager::Instance()->RetrieveTempQuad(go->mRules->bg);
}
if (!quad)
{
quad = resources.RetrieveTempQuad("backdrop.jpg");
quad = WResourceManager::Instance()->RetrieveTempQuad("backdrop.jpg");
}
if (!quad)
return;