[Scummvm-cvs-logs] SF.net SVN: scummvm: [21136] scummvm/trunk/engines/kyra/sound_adlib.cpp
vinterstum at users.sourceforge.net
vinterstum at users.sourceforge.net
Tue Mar 7 17:39:05 CET 2006
Revision: 21136
Author: vinterstum
Date: 2006-03-07 17:38:27 -0800 (Tue, 07 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21136&view=rev
Log Message:
-----------
The adlib code was calling the Kyra delay() function instead of the
system delay, which was causing concurrency problems.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/sound_adlib.cpp
Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp 2006-03-07 22:27:14 UTC (rev 21135)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp 2006-03-08 01:38:27 UTC (rev 21136)
@@ -1994,7 +1994,8 @@
return;
soundId &= 0xFF;
while ((_driver->callback(16, 0) & 8)) {
- _engine->delay(10);
+ // We call the system delay and not the game delay to avoid concurrency issues.
+ _engine->_system->delayMillis(10);
}
if (_sfxPlayingSound != -1) {
_driver->callback(10, _sfxPlayingSound, int(1), int(_sfxSecondByteOfSong));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list