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

Fixed a problem when running the multithreaded testsuite with sound.

Browse Source
This commit is contained in:
Xawotihs
2012-01-11 20:13:24 +00:00
parent f388414f3f
commit cb7f3b070f
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1018,7 +1018,7 @@ int MTGCardInstance::cantBeBlockedBy(MTGCardInstance * card)
/* Choose a sound sample to associate to that card */
JSample * MTGCardInstance::getSample()
{
JSample * js;
JSample * js = 0;
if (sample.size())
return WResourceManager::Instance()->RetrieveSample(sample);
@@ -1028,11 +1028,14 @@ JSample * MTGCardInstance::getSample()
string type = Subtypes::subtypesList->find(types[i]);
std::transform(type.begin(), type.end(), type.begin(), ::tolower);
type = type + ".wav";
js = WResourceManager::Instance()->RetrieveSample(type);
if (js)
if(getObserver() && getObserver()->getResourceManager())
{
sample = string(type);
return js;
js = WResourceManager::Instance()->RetrieveSample(type);
if (js)
{
sample = string(type);
return js;
}
}
}
@@ -1044,11 +1047,14 @@ JSample * MTGCardInstance::getSample()
continue;
string type = Constants::MTGBasicAbilities[x];
type = type + ".wav";
js = WResourceManager::Instance()->RetrieveSample(type);
if (js)
if(getObserver() && getObserver()->getResourceManager())
{
sample = string(type);
return js;
js = WResourceManager::Instance()->RetrieveSample(type);
if (js)
{
sample = string(type);
return js;
}
}
}
}
@@ -1059,11 +1065,14 @@ JSample * MTGCardInstance::getSample()
type = Subtypes::subtypesList->find(types[0]);
std::transform(type.begin(), type.end(), type.begin(), ::tolower);
type.append(".wav");
js = WResourceManager::Instance()->RetrieveSample(type);
if (js)
if(getObserver() && getObserver()->getResourceManager())
{
sample = string(type);
return js;
js = WResourceManager::Instance()->RetrieveSample(type);
if (js)
{
sample = string(type);
return js;
}
}
return NULL;