aboutsummaryrefslogtreecommitdiff
path: root/engines/sky/sound.cpp
diff options
context:
space:
mode:
authorJoost Peters2009-02-13 16:55:16 +0000
committerJoost Peters2009-02-13 16:55:16 +0000
commitf051fbb9d811d63c20c4a8d1232c877574922b4a (patch)
tree5817e04d528644ef8d8d9096cbb552e0ea73dfcd /engines/sky/sound.cpp
parent501b3215323fac6efbd5cbd5168e6118263f2809 (diff)
downloadscummvm-rg350-f051fbb9d811d63c20c4a8d1232c877574922b4a.tar.gz
scummvm-rg350-f051fbb9d811d63c20c4a8d1232c877574922b4a.tar.bz2
scummvm-rg350-f051fbb9d811d63c20c4a8d1232c877574922b4a.zip
Formatting changes / consistency
svn-id: r36304
Diffstat (limited to 'engines/sky/sound.cpp')
-rw-r--r--engines/sky/sound.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp
index f15038c0b6..9f15b38378 100644
--- a/engines/sky/sound.cpp
+++ b/engines/sky/sound.cpp
@@ -1036,7 +1036,6 @@ Sound::~Sound(void) {
}
void Sound::playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *handle) {
-
byte flags = 0;
flags |= Audio::Mixer::FLAG_UNSIGNED|Audio::Mixer::FLAG_AUTOFREE;
size -= sizeof(struct dataFileHeader);
@@ -1048,7 +1047,6 @@ void Sound::playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *h
}
void Sound::loadSection(uint8 pSection) {
-
fnStopFx();
_mixer->stopAll();
@@ -1082,7 +1080,6 @@ void Sound::loadSection(uint8 pSection) {
}
void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) {
-
if (channel == 0)
_mixer->stopID(SOUND_CH0);
else
@@ -1128,7 +1125,6 @@ void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) {
}
void Sound::fnStartFx(uint32 sound, uint8 channel) {
-
_saveSounds[channel] = 0xFFFF;
if (sound < 256 || sound > MAX_FX_NUMBER || (SkyEngine::_systemVars.systemFlags & SF_FX_OFF))
return;
@@ -1191,7 +1187,6 @@ void Sound::checkFxQueue(void) {
}
void Sound::restoreSfx(void) {
-
// queue sfx, so they will be started when the player exits the control panel
memset(_sfxQueue, 0, sizeof(_sfxQueue));
uint8 queueSlot = 0;
@@ -1221,7 +1216,6 @@ void Sound::stopSpeech(void) {
}
bool Sound::startSpeech(uint16 textNum) {
-
if (!(SkyEngine::_systemVars.systemFlags & SF_ALLOW_SPEECH))
return false;
uint16 speechFileNum = _speechConvertTable[textNum >> 12] + (textNum & 0xFFF);
@@ -1254,7 +1248,6 @@ bool Sound::startSpeech(uint16 textNum) {
}
void Sound::fnPauseFx(void) {
-
if (!_isPaused) {
_isPaused = true;
_mixer->pauseID(SOUND_CH0, true);
@@ -1263,7 +1256,6 @@ void Sound::fnPauseFx(void) {
}
void Sound::fnUnPauseFx(void) {
-
if (_isPaused) {
_isPaused = false;
_mixer->pauseID(SOUND_CH0, false);