mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-09 21:34:01 +00:00
Code Issues Releases Wiki Activity

another gcc 4.5 breakage, delete old unused leftovers

Browse source
This commit is contained in:
fgenesis 2016-10-03 22:34:54 +02:00
parent bc77c89ad3
commit 80175c3df6
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
BBGE/SoundManager.cpp
View file

@ -992,10 +992,7 @@ void *SoundManager::playSfx(const PlaySfx &play)
FMOD::Channel *channel = 0; FMOD::Channel *channel = 0;
FMOD::Sound *sound = 0; FMOD::Sound *sound = 0;
if (!play.name.empty())
if (play.handle)
sound = (FMOD::Sound*)play.handle;
else if (!play.name.empty())
sound = (FMOD::Sound*)getBuffer(play.name); sound = (FMOD::Sound*)getBuffer(play.name);
if (!sound) return 0; if (!sound) return 0;

3
BBGE/SoundManager.h
View file

@ -83,12 +83,11 @@ enum SoundLoadType
struct PlaySfx struct PlaySfx
{ {
PlaySfx() : priority(0.5), handle(0), vol(1), fade(SFT_NONE), PlaySfx() : priority(0.5), vol(1), fade(SFT_NONE),
time(0), freq(1), loops(0), time(0), freq(1), loops(0),
maxdist(0), x(0), y(0), relative(true), positional(false) {} maxdist(0), x(0), y(0), relative(true), positional(false) {}
std::string name; std::string name;
intptr_t handle;
float vol; float vol;
float time; float time;
float freq; float freq;