aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics
diff options
context:
space:
mode:
authorFilippos Karapetis2011-01-22 14:58:17 +0000
committerFilippos Karapetis2011-01-22 14:58:17 +0000
commit7dd28c024aa68f76be48de23b66f27dc6cec90cc (patch)
tree15b0d4aa1512b2aab9af0dcaf3a2344c9c153ae2 /engines/sci/graphics
parent8a44af63af743f5fc3c5e263df3fb14efdc3e1d6 (diff)
downloadscummvm-rg350-7dd28c024aa68f76be48de23b66f27dc6cec90cc.tar.gz
scummvm-rg350-7dd28c024aa68f76be48de23b66f27dc6cec90cc.tar.bz2
scummvm-rg350-7dd28c024aa68f76be48de23b66f27dc6cec90cc.zip
SCI: Moved the robot audio playing test code inside GfxRobot::playAudio()
svn-id: r55428
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r--engines/sci/graphics/robot.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/engines/sci/graphics/robot.cpp b/engines/sci/graphics/robot.cpp
index ce153e4417..546403b779 100644
--- a/engines/sci/graphics/robot.cpp
+++ b/engines/sci/graphics/robot.cpp
@@ -161,15 +161,6 @@ void GfxRobot::setPalette() {
}
void GfxRobot::drawNextFrame() {
- // Play the audio of the robot file (for debugging)
-#if 0
- if (_hasSound) {
- Audio::SoundHandle _audioHandle;
- Audio::AudioStream *audioStream = g_sci->_audio->getRobotAudioStream(_resourceData);
- g_system->getMixer()->playStream(Audio::Mixer::kSpeechSoundType, &_audioHandle, audioStream);
- }
-#endif
-
int width, height;
byte *pixels = assembleVideoFrame(_curFrame);
@@ -305,7 +296,13 @@ int GfxRobot::getFrameScale(int frame) {
}
void GfxRobot::playAudio() {
-// Audio::Mixer *mixer = g_system->getMixer();
+#if 0
+ if (_hasSound) {
+ Audio::SoundHandle _audioHandle;
+ Audio::AudioStream *audioStream = g_sci->_audio->getRobotAudioStream(_resourceData);
+ g_system->getMixer()->playStream(Audio::Mixer::kSpeechSoundType, &_audioHandle, audioStream);
+ }
+#endif
}