[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.49,1.50

Max Horn fingolfin at users.sourceforge.net
Wed Sep 10 05:54:04 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv18561/scumm/smush

Modified Files:
	smush_player.cpp 
Log Message:
added refCon parameter to timer class

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- smush_player.cpp	6 Sep 2003 10:47:29 -0000	1.49
+++ smush_player.cpp	10 Sep 2003 12:43:53 -0000	1.50
@@ -195,8 +195,8 @@
 
 SmushPlayer *player;
 
-void SmushPlayer::timerCallback(void *ptr) {
-	Scumm *scumm = (Scumm *)ptr;
+void SmushPlayer::timerCallback(void *refCon) {
+	Scumm *scumm = (Scumm *)refCon;
 	if (!scumm->_smushPlay)
 		return;
 
@@ -255,7 +255,7 @@
 	_smixer->_silentMixer = _scumm->_silentDigitalImuse;
 	_scumm->_smushPlay = true;
 	_dst = _scumm->virtscr[0].screenPtr + _scumm->virtscr[0].xstart;
-	_scumm->_timer->installProcedure(&timerCallback, _speed);
+	_scumm->_timer->installProcedure(&timerCallback, _speed, _scumm);
 
 	_alreadyInit = false;
 }





More information about the Scummvm-git-logs mailing list