aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/sound.cpp
diff options
context:
space:
mode:
authorMatthew Stewart2018-05-11 02:17:57 -0400
committerEugene Sandulenko2018-08-09 08:37:30 +0200
commitd375429abef0109a483970975b053292efa4bd6e (patch)
tree448bd50bc330010834b3e1f655903bf1b2d7e93e /engines/startrek/sound.cpp
parentfde5f22f9783c557c74d0267d8118c1a0c6d498e (diff)
downloadscummvm-rg350-d375429abef0109a483970975b053292efa4bd6e.tar.gz
scummvm-rg350-d375429abef0109a483970975b053292efa4bd6e.tar.bz2
scummvm-rg350-d375429abef0109a483970975b053292efa4bd6e.zip
STARTREK: Objects and animations.
Testing them with the transporter room.
Diffstat (limited to 'engines/startrek/sound.cpp')
-rw-r--r--engines/startrek/sound.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/startrek/sound.cpp b/engines/startrek/sound.cpp
index 2871a88613..105b3a0b7a 100644
--- a/engines/startrek/sound.cpp
+++ b/engines/startrek/sound.cpp
@@ -149,6 +149,9 @@ void Sound::playMidiMusicTracks(int startTrack, int loopTrack) {
playMidiTrackInSlot(0, startTrack);
}
+/**
+ * TODO: original game had some caching of loaded voc files.
+ */
void Sound::playVoc(const Common::String &baseSoundName) {
/*
if (_vm->getPlatform() == Common::kPlatformAmiga)
@@ -169,7 +172,7 @@ void Sound::playVoc(const Common::String &baseSoundName) {
sub_2aaa3();
*/
- for (int i=0; i<MAX_SFX_PLAYING; i++) {
+ for (int i = 0; i < MAX_SFX_PLAYING; i++) {
if (_vm->_system->getMixer()->isSoundHandleActive(_sfxHandles[i]))
continue;
@@ -304,7 +307,7 @@ void Sound::loadPCMusicFile(const Common::String &baseSoundName) {
}
debugC(5, kDebugSound, "Loading midi \'%s\'\n", soundName.c_str());
- SharedPtr<Common::SeekableReadStream> soundStream = _vm->openFile(soundName.c_str());
+ SharedPtr<Common::SeekableReadStream> soundStream = _vm->loadFile(soundName.c_str());
if (loadedSoundData != nullptr)
delete[] loadedSoundData;