aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sky/logic.cpp1
-rw-r--r--sky/sound.cpp4
2 files changed, 1 insertions, 4 deletions
diff --git a/sky/logic.cpp b/sky/logic.cpp
index 4464bf0615..02f0e9b7b3 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -2074,7 +2074,6 @@ void SkyLogic::stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32
if (SkyState::isCDVersion(_gameVersion))
_skySound->fnStartSpeech((uint16)textNum);
-// warning("stdSpeak: speech not implemented yet");
//now form the text sprite
struct lowTextManager_t textInfo;
diff --git a/sky/sound.cpp b/sky/sound.cpp
index 45e30670cd..090f2ba9f9 100644
--- a/sky/sound.cpp
+++ b/sky/sound.cpp
@@ -1087,7 +1087,6 @@ void SkySound::playSound(uint16 sound, uint16 volume) {
if (dataSize == dataLoop)
flags |= SoundMixer::FLAG_LOOP;
- //_mixer->stopAll();
if (_ingameSound > 0) _mixer->stop(_ingameSound - 1);
_mixer->setVolume(volume);
_mixer->playRaw(&_ingameSound, _soundData + dataOfs, dataSize, sampleRate, flags);
@@ -1154,5 +1153,4 @@ void SkySound::fnStartSpeech(uint16 textNum) {
// TODO: implement pre_after_table_area to find and prefetch file for next speech
_mixer->playRaw(&_ingameSpeech, playBuffer, speechSize - 64, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
-
-} \ No newline at end of file
+}