[Scummvm-cvs-logs] scummvm master -> 9e4d3234c59b93a332065af6ba81d715c8d0033b
wjp
wjp at usecode.org
Fri Nov 4 10:13:13 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9e4d3234c5 SCUMM: Revert "Removed a duplicate variable assignment"
Commit: 9e4d3234c59b93a332065af6ba81d715c8d0033b
https://github.com/scummvm/scummvm/commit/9e4d3234c59b93a332065af6ba81d715c8d0033b
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-04T02:04:42-07:00
Commit Message:
SCUMM: Revert "Removed a duplicate variable assignment"
This reverts commit 747ebffd17eb64423fd8fb321f9d803ec31105f4,
and adds a FIXME.
Changed paths:
engines/scumm/imuse/imuse_player.cpp
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index d733a26..53ccfb3 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;
}
More information about the Scummvm-git-logs
mailing list