[Scummvm-cvs-logs] CVS: scummvm/saga resnames.h,1.7,1.8 sfuncs.cpp,1.25,1.26

[Torbjörn Andersson]

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

Modified Files:
	resnames.h sfuncs.cpp 
Log Message:
Oops, now it plays the correct music again, I hope. The sound effects seem
a bit better now, too. At least the crowd is no longer cheering when the
fair is closed.


Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- resnames.h	19 Oct 2004 18:11:50 -0000	1.7
+++ resnames.h	19 Oct 2004 18:45:42 -0000	1.8
@@ -156,7 +156,6 @@
 
 // TODO: These are only in the CD version, and I can't find them in the source
 //       code we got. Someone needs to verify these to get the correct values.
-//       They appear to be a bit off right now.
 
 #define FX_CROWD_01 56
 #define FX_CROWD_02 57

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sfuncs.cpp	19 Oct 2004 18:11:50 -0000	1.25
+++ sfuncs.cpp	19 Oct 2004 18:45:42 -0000	1.26
@@ -723,7 +723,7 @@
 
 // Script function #63 (0x3F)
 int Script::SF_playMusic(R_SCRIPTFUNC_PARAMS) {
-	SDataWord_T param = thread->pop();
+	SDataWord_T param = thread->pop() + 9;
 
 	if (param >= 9 && param <= 34)
 		_vm->_music->play(param);
@@ -806,7 +806,7 @@
 
 // Script function #70 (0x46)
 int Script::SF_playSound(R_SCRIPTFUNC_PARAMS) {
-	SDataWord_T param = thread->pop() - 14;
+	SDataWord_T param = thread->pop() - 13;
 
 	if (/* param >= 0 && */ param < ARRAYSIZE(sfxTable))
 		_vm->_sndRes->playSound(sfxTable[param].res, sfxTable[param].vol);