CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add dynamic_cast for playSound

Browse Source 
makes it so developers don't need to dynamic_cast any time they want to play sound
This commit is contained in:
Modnark
2022-10-11 21:28:19 -04:00
parent 9df862f72e
commit af5c31d5d0
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/DataModelV2/SoundService.h
View File

@@ -10,7 +10,7 @@ public:
~SoundService(void); ~SoundService(void);
float getMusicVolume(); float getMusicVolume();
void playSound(SoundInstance* sound); void playSound(Instance* sound);
private: private:
float musicVolume; float musicVolume;
}; };

4
src/source/DataModelV2/PartInstance.cpp
View File

@@ -525,10 +525,10 @@ void PartInstance::onTouch()
case Enum::Sound::NoSound: case Enum::Sound::NoSound:
break; break;
case Enum::Sound::Victory: case Enum::Sound::Victory:
sndService->playSound(dynamic_cast<SoundInstance*>(sndService->findFirstChild("Victory"))); sndService->playSound(sndService->findFirstChild("Victory"));
break; break;
case Enum::Sound::Boing: case Enum::Sound::Boing:
sndService->playSound(dynamic_cast<SoundInstance*>(sndService->findFirstChild("Boing"))); sndService->playSound(sndService->findFirstChild("Boing"));
break; break;
} }
} }

9
src/source/DataModelV2/SoundService.cpp
View File

@@ -71,11 +71,16 @@ SoundService::~SoundService(void)
{ {
} }
void SoundService::playSound(SoundInstance* sound) void SoundService::playSound(Instance* sound)
{ {
std::string soundId = sound->getSoundId(); // Try to dynamic_cast it to SoundInstance
SoundInstance* sndInst = dynamic_cast<SoundInstance*>(sound);
if(sndInst != NULL)
{
std::string soundId = sndInst->getSoundId();
AudioPlayer::playSound(GetFileInPath(soundId)); AudioPlayer::playSound(GetFileInPath(soundId));
} }
}
float SoundService::getMusicVolume() float SoundService::getMusicVolume()
{ {