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

14
projects/mtg/src/GuiFrame.cpp
View File

@@ -5,8 +5,8 @@
GuiFrame::GuiFrame()
{
if (resources.GetTexture("wood.png"))
wood = resources.RetrieveQuad("wood.png", 0, 0, SCREEN_WIDTH, 28);
if (WResourceManager::Instance()->GetTexture("wood.png"))
wood = WResourceManager::Instance()->RetrieveQuad("wood.png", 0, 0, SCREEN_WIDTH, 28);
else
{
wood = NULL;
@@ -14,12 +14,12 @@ GuiFrame::GuiFrame()
}
goldGlow = gold1 = gold2 = NULL;
if (resources.GetTexture("gold.png"))
if (WResourceManager::Instance()->GetTexture("gold.png"))
{
gold1 = resources.RetrieveQuad("gold.png", 0, 0, SCREEN_WIDTH, 6, "gold1");
gold2 = resources.RetrieveQuad("gold.png", 0, 6, SCREEN_WIDTH, 6, "gold2");
if (resources.GetTexture("goldglow.png"))
goldGlow = resources.RetrieveQuad("goldglow.png", 1, 1, SCREEN_WIDTH - 2, 18);
gold1 = WResourceManager::Instance()->RetrieveQuad("gold.png", 0, 0, SCREEN_WIDTH, 6, "gold1");
gold2 = WResourceManager::Instance()->RetrieveQuad("gold.png", 0, 6, SCREEN_WIDTH, 6, "gold2");
if (WResourceManager::Instance()->GetTexture("goldglow.png"))
goldGlow = WResourceManager::Instance()->RetrieveQuad("goldglow.png", 1, 1, SCREEN_WIDTH - 2, 18);
if (gold2)
{
gold2->SetColor(ARGB(127, 255, 255, 255));