aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorNorbert Lange2009-06-19 20:41:32 +0000
committerNorbert Lange2009-06-19 20:41:32 +0000
commitf94b8565a9ee413c849563b33e959bcaed8376fa (patch)
treea41dcc0de838d864325ea7266136a35ffeef4cb2 /engines
parent4865863f6cff6c141edaf4f6cb6ce4ef2687d12a (diff)
downloadscummvm-rg350-f94b8565a9ee413c849563b33e959bcaed8376fa.tar.gz
scummvm-rg350-f94b8565a9ee413c849563b33e959bcaed8376fa.tar.bz2
scummvm-rg350-f94b8565a9ee413c849563b33e959bcaed8376fa.zip
more cleanups, got rid of pendingTrackstep variable
svn-id: r41686
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/player_v4a.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/engines/scumm/player_v4a.cpp b/engines/scumm/player_v4a.cpp
index 6be06c018e..7dddffe0ad 100644
--- a/engines/scumm/player_v4a.cpp
+++ b/engines/scumm/player_v4a.cpp
@@ -75,7 +75,6 @@ void Player_V4A::setMusicVolume(int vol) {
debug("player_v4a: setMusicVolume %i", vol);
}
-
void Player_V4A::stopAllSounds() {
if (_musicId)
stopSound(_musicId);
@@ -133,13 +132,11 @@ void Player_V4A::startSound(int nr) {
_tfmxPlay->doSong(index);
_musicId = nr;
-
if (!_mixer->isSoundHandleActive(_musicHandle))
_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _tfmxPlay, -1, Audio::Mixer::kMaxChannelVolume, 0, false, false);
}
}
-
int Player_V4A::getMusicTimer() const {
if (_musicId) {
// TODO: The titlesong is running with ~70 ticks per second and the scale seems to be based on that.