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

10
projects/mtg/src/MTGCardInstance.cpp
View File

@@ -570,7 +570,7 @@ int MTGCardInstance::canBlock(MTGCardInstance * opponent)
JQuad * MTGCardInstance::getIcon()
{
return resources.RetrieveCard(this, CACHE_THUMB);
return WResourceManager::Instance()->RetrieveCard(this, CACHE_THUMB);
}
MTGCardInstance * MTGCardInstance::getNextPartner()
@@ -891,13 +891,13 @@ JSample * MTGCardInstance::getSample()
JSample * js;
if (sample.size())
return resources.RetrieveSample(sample);
return WResourceManager::Instance()->RetrieveSample(sample);
for (int i = types.size() - 1; i > 0; i--)
{
string type = Subtypes::subtypesList->find(types[i]);
type = type + ".wav";
js = resources.RetrieveSample(type);
js = WResourceManager::Instance()->RetrieveSample(type);
if (js)
{
sample = string(type);
@@ -912,7 +912,7 @@ JSample * MTGCardInstance::getSample()
continue;
string type = Constants::MTGBasicAbilities[i];
type = type + ".wav";
js = resources.RetrieveSample(type);
js = WResourceManager::Instance()->RetrieveSample(type);
if (js)
{
sample = string(type);
@@ -922,7 +922,7 @@ JSample * MTGCardInstance::getSample()
string type = Subtypes::subtypesList->find(types[0]);
type = type + ".wav";
js = resources.RetrieveSample(type);
js = WResourceManager::Instance()->RetrieveSample(type);
if (js)
{
sample = string(type);