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

8
projects/mtg/src/WDataSrc.cpp
View File

@@ -37,7 +37,7 @@ bool WSyncable::prev()
//WSrcImage
JQuad * WSrcImage::getImage(int offset)
{
return resources.RetrieveTempQuad(filename);
return WResourceManager::Instance()->RetrieveTempQuad(filename);
}
WSrcImage::WSrcImage(string s)
@@ -60,15 +60,15 @@ JQuad * WSrcCards::getImage(int offset)
#else
if (mDelay && mLastInput < mDelay)
{
return resources.RetrieveCard(getCard(offset), RETRIEVE_EXISTING);
return WResourceManager::Instance()->RetrieveCard(getCard(offset), RETRIEVE_EXISTING);
}
#endif
return resources.RetrieveCard(getCard(offset));
return WResourceManager::Instance()->RetrieveCard(getCard(offset));
}
JQuad * WSrcCards::getThumb(int offset)
{
return resources.RetrieveCard(getCard(offset), RETRIEVE_THUMB);
return WResourceManager::Instance()->RetrieveCard(getCard(offset), RETRIEVE_THUMB);
}
WSrcCards::~WSrcCards()