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/GuiHand.cpp
View File

@@ -35,7 +35,7 @@ HandLimitor::HandLimitor(GuiHand* hand) :
GuiHand::GuiHand(MTGHand* hand) :
GuiLayer(), hand(hand)
{
back = resources.RetrieveTempQuad("handback.png");
back = WResourceManager::Instance()->RetrieveTempQuad("handback.png");
if (back)
back->SetTextureRect(1, 0, 100, 250);
else
@@ -68,7 +68,7 @@ GuiHandOpponent::GuiHandOpponent(MTGHand* hand) :
void GuiHandOpponent::Render()
{
JQuad * quad = resources.GetQuad("back_thumb");
JQuad * quad = WResourceManager::Instance()->GetQuad("back_thumb");
float x = 45;
for (vector<CardView*>::iterator it = cards.begin(); it != cards.end(); ++it)
@@ -202,7 +202,7 @@ void GuiHandSelf::Render()
//Empty hand
if (state == Open && cards.size() == 0)
{
WFont * mFont = resources.GetWFont(Fonts::MAIN_FONT);
WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
mFont->SetColor(ARGB(255,255,0,0));
if (OptionHandDirection::HORIZONTAL == options[Options::HANDDIRECTION].number)
{