Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
projects/mtg/src/GuiPhaseBar.cpp
View File

@@ -44,7 +44,7 @@ GuiPhaseBar::GuiPhaseBar() :
phase(NULL), angle(0.0f)
{
JQuad * quad = NULL;
if ((quad = resources.GetQuad("phasebar")) != NULL)
if ((quad = WResourceManager::Instance()->GetQuad("phasebar")) != NULL)
{
quad->mHeight = kHeight;
quad->mWidth = kWidth;
@@ -68,7 +68,7 @@ void GuiPhaseBar::Update(float dt)
void GuiPhaseBar::Render()
{
GameObserver * g = GameObserver::GetInstance();
JQuad * quad = resources.GetQuad("phasebar");
JQuad * quad = WResourceManager::Instance()->GetQuad("phasebar");
JRenderer::GetInstance()->DrawLine(0, CENTER, SCREEN_WIDTH, CENTER, ARGB(255, 255, 255, 255));
@@ -101,7 +101,7 @@ void GuiPhaseBar::Render()
}
//print phase name
WFont * font = resources.GetWFont(Fonts::MAIN_FONT);
WFont * font = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
string currentP = _("your turn");
string interrupt = "";
if (g->currentPlayer == g->players[1])