[Scummvm-cvs-logs] CVS: scummvm/saga sfuncs.cpp,1.77,1.78

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sun Jan 16 09:07:06 CET 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13433

Modified Files:
	sfuncs.cpp 
Log Message:
sfPlayMusic() takes two parameters in IHNM. Since our current
implementation is only right for ITE, disable it for IHNM for now.


Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- sfuncs.cpp	15 Jan 2005 20:12:48 -0000	1.77
+++ sfuncs.cpp	16 Jan 2005 17:06:40 -0000	1.78
@@ -1301,12 +1301,19 @@
 
 // Script function #63 (0x3F)
 int Script::sfPlayMusic(SCRIPTFUNC_PARAMS) {
-	ScriptDataWord param = thread->pop() + 9;
+	if (_vm->getGameType() == GType_ITE) {
+		ScriptDataWord param = thread->pop() + 9;
 
-	if (param >= 9 && param <= 34)
-		_vm->_music->play(param);
-	else
-		_vm->_music->stop();
+		if (param >= 9 && param <= 34)
+			_vm->_music->play(param);
+		else
+			_vm->_music->stop();
+	} else {
+		ScriptDataWord param1 = thread->pop();
+		ScriptDataWord param2 = thread->pop();
+
+		debug(1, "Stub: sfPlayMusic(%d, %d)", param1, param2);
+	}
 
 	return SUCCESS;
 }





More information about the Scummvm-git-logs mailing list