[Scummvm-cvs-logs] SF.net SVN: scummvm: [25296] scummvm/trunk/engines/scumm/smush/smush_player .cpp

cyx at users.sourceforge.net cyx at users.sourceforge.net
Wed Jan 31 01:16:22 CET 2007


Revision: 25296
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25296&view=rev
Author:   cyx
Date:     2007-01-30 16:16:21 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
reset _IACTpos when _IACTchannel is stopped (fixes memory overwrites in handleIACT during smush playback at the end of CMI demo)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/smush/smush_player.cpp

Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp	2007-01-30 22:44:14 UTC (rev 25295)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp	2007-01-31 00:16:21 UTC (rev 25296)
@@ -309,6 +309,7 @@
 
 	_vm->_mixer->stopHandle(_compressedFileSoundHandle);
 	_vm->_mixer->stopHandle(_IACTchannel);
+	_IACTpos = 0;
 	_vm->_smixer->stop();
 
 	_initDone = true;
@@ -1407,6 +1408,7 @@
 			_smixer->stop();
 			_vm->_mixer->stopHandle(_compressedFileSoundHandle);
 			_vm->_mixer->stopHandle(_IACTchannel);
+			_IACTpos = 0;
 			break;
 		}
 		_vm->_system->delayMillis(10);


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