[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.96,1.97

Jamieson Christian jamieson630 at users.sourceforge.net
Fri Dec 13 07:17:09 CET 2002


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

Modified Files:
	imuse.cpp 
Log Message:
Bug [622895] fix:
Fixed do_command(256) implementation.

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- imuse.cpp	11 Dec 2002 16:09:55 -0000	1.96
+++ imuse.cpp	13 Dec 2002 15:16:40 -0000	1.97
@@ -1519,9 +1519,10 @@
 		switch (cmd) {
 		case 0:
 			if (g_scumm->_gameId == GID_SAMNMAX) {
-				if (d == 1)
-					return player->_marker;
-				else if (d == 2)
+				if (d == 1) // Measure number
+					// return player->_marker;
+					return ((player->_beat_index - 1) >> 2) + 1;
+				else if (d == 2) // Beat number
 					return player->_beat_index;
 				return -1;
 			} else {





More information about the Scummvm-git-logs mailing list