diff options
| author | Strangerke | 2019-08-15 23:40:11 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-09-03 17:17:33 +0200 |
| commit | 29eb9dc9d61d15d673530b8aa6cbec02eb8ad30f (patch) | |
| tree | 54f648b45f805ef16ee24eeca85a4ddea6ff1997 /engines/hdb/sound.h | |
| parent | eaa972347f42d4e6a5e0e47974ab7d360cdfe44b (diff) | |
| download | scummvm-rg350-29eb9dc9d61d15d673530b8aa6cbec02eb8ad30f.tar.gz scummvm-rg350-29eb9dc9d61d15d673530b8aa6cbec02eb8ad30f.tar.bz2 scummvm-rg350-29eb9dc9d61d15d673530b8aa6cbec02eb8ad30f.zip | |
HDB: Remove an unused member of Song, get rid of the return value of several sound functions
Diffstat (limited to 'engines/hdb/sound.h')
| -rw-r--r-- | engines/hdb/sound.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/engines/hdb/sound.h b/engines/hdb/sound.h index c9c2eedb37..d810cae28c 100644 --- a/engines/hdb/sound.h +++ b/engines/hdb/sound.h @@ -1462,7 +1462,6 @@ struct SoundCache { struct Song { bool playing; SoundType song; - const char *sndMusic; Audio::SoundHandle *handle; bool fadingOut; @@ -1473,7 +1472,7 @@ struct Song { int fadeInVol; int fadeInRamp; - Song() : playing(false), song(SONG_NONE), sndMusic(nullptr), handle(new Audio::SoundHandle()), + Song() : playing(false), song(SONG_NONE), handle(new Audio::SoundHandle()), fadingOut(false), fadeOutVol(0), fadeOutRamp(0), fadingIn(false), fadeInVol(0), fadeInRamp(0) {} ~Song() { @@ -1511,19 +1510,19 @@ public: memset(&_voicePlayed[0], 0, sizeof(_voicePlayed)); } - bool playSound(int index); - bool playSoundEx(int index, int channel, bool loop); - bool playVoice(int index, int actor); - bool startMusic(SoundType song); - bool fadeInMusic(SoundType song, int ramp); + void playSound(int index); + void playSoundEx(int index, int channel, bool loop); + void playVoice(int index, int actor); + void startMusic(SoundType song); + void fadeInMusic(SoundType song, int ramp); void fadeOutMusic(int ramp); void stopMusic(); - bool beginMusic(SoundType song, bool fadeIn, int ramp); + void beginMusic(SoundType song, bool fadeIn, int ramp); void updateMusic(); bool songPlaying(SoundType song); - bool stopChannel(int channel); + void stopChannel(int channel); int registerSound(const char *name); - bool freeSound(int index); + void freeSound(int index); const char *getSNDLuaName(int index); int getSNDIndex(const char *name); int getNumSounds() { |