aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-11-04 10:01:36 +0100
committerWillem Jan Palenstijn2011-11-04 10:04:42 +0100
commit9e4d3234c59b93a332065af6ba81d715c8d0033b (patch)
tree155fa2be61fb8d83c59f68dece53dd1a24e4f6c1 /engines/scumm
parentec6a9d28727071c73e7de113d0530a71ef24b7d6 (diff)
downloadscummvm-rg350-9e4d3234c59b93a332065af6ba81d715c8d0033b.tar.gz
scummvm-rg350-9e4d3234c59b93a332065af6ba81d715c8d0033b.tar.bz2
scummvm-rg350-9e4d3234c59b93a332065af6ba81d715c8d0033b.zip
SCUMM: Revert "Removed a duplicate variable assignment"
This reverts commit 747ebffd17eb64423fd8fb321f9d803ec31105f4, and adds a FIXME.
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/imuse/imuse_player.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index d733a2693a..53ccfb3734 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -592,12 +592,13 @@ bool Player::setLoop(uint count, uint tobeat, uint totick, uint frombeat, uint f
if (tobeat == 0)
tobeat = 1;
- //_loop_counter = 0; // Because of possible interrupts
- _loop_counter = count;
+ // FIXME: Thread safety?
+ _loop_counter = 0; // Because of possible interrupts
_loop_to_beat = tobeat;
_loop_to_tick = totick;
_loop_from_beat = frombeat;
_loop_from_tick = fromtick;
+ _loop_counter = count;
return true;
}