1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-26 02:07:26 +00:00

another gcc 4.5 breakage, delete old unused leftovers

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

View file

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

View file

@ -83,12 +83,11 @@ enum SoundLoadType
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),
maxdist(0), x(0), y(0), relative(true), positional(false) {}
std::string name;
intptr_t handle;
float vol;
float time;
float freq;