diff options
| author | Travis Howell | 2009-11-26 00:31:19 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-11-26 00:31:19 +0000 |
| commit | 8783b0f2f7dbfb44c977812244a4ab4cde47a796 (patch) | |
| tree | e1d210c4759d432a43d7805f20423257fb76a764 /engines/scumm/imuse | |
| parent | 4e830d821cadbf1e29d2fe212a33e23770a890f8 (diff) | |
| download | scummvm-rg350-8783b0f2f7dbfb44c977812244a4ab4cde47a796.tar.gz scummvm-rg350-8783b0f2f7dbfb44c977812244a4ab4cde47a796.tar.bz2 scummvm-rg350-8783b0f2f7dbfb44c977812244a4ab4cde47a796.zip | |
Add patch #2839048 - MM C64 sound/music player, with minor changes.
svn-id: r46143
Diffstat (limited to 'engines/scumm/imuse')
| -rw-r--r-- | engines/scumm/imuse/imuse.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse/imuse_internal.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index 5b00a973f9..80b08f7ad4 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -537,7 +537,7 @@ int IMuseInternal::getSoundStatus(int sound) const { return getSoundStatus_internal (sound, true); } -int IMuseInternal::getMusicTimer() const { +int IMuseInternal::getMusicTimer() { Common::StackLock lock(_mutex, "IMuseInternal::getMusicTimer()"); int best_time = 0; const Player *player = _players; diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h index e3d2b9b2a4..93244b8c1d 100644 --- a/engines/scumm/imuse/imuse_internal.h +++ b/engines/scumm/imuse/imuse_internal.h @@ -535,7 +535,7 @@ public: void stopSound(int sound); void stopAllSounds(); int getSoundStatus(int sound) const; - int getMusicTimer() const; + int getMusicTimer(); public: // Factory function |