[Scummvm-cvs-logs] CVS: scummvm/saga resnames.h,1.8,1.9 script.h,1.19,1.20 sfuncs.cpp,1.26,1.27

Eugene Sandulenko sev at users.sourceforge.net
Wed Oct 20 15:44:11 CEST 2004


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

Modified Files:
	resnames.h script.h sfuncs.cpp 
Log Message:
FX_CROWD constants are correct. 
Add some simple stub.


Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resnames.h	19 Oct 2004 18:45:42 -0000	1.8
+++ resnames.h	20 Oct 2004 22:38:24 -0000	1.9
@@ -154,8 +154,7 @@
 #define FX_JAIL_DOOR 54
 #define FX_KILN_FIRE 55
 
-// 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.
+// These are only in the CD version
 
 #define FX_CROWD_01 56
 #define FX_CROWD_02 57

Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- script.h	9 Oct 2004 07:39:46 -0000	1.19
+++ script.h	20 Oct 2004 22:38:24 -0000	1.20
@@ -274,6 +274,7 @@
 	int SF_getActorX(R_SCRIPTFUNC_PARAMS);
 	int SF_getActorY(R_SCRIPTFUNC_PARAMS);
 	int SF_playMusic(R_SCRIPTFUNC_PARAMS);
+	int SF_enableEscape(R_SCRIPTFUNC_PARAMS);
 	int SF_playSound(R_SCRIPTFUNC_PARAMS);
 };
 

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sfuncs.cpp	19 Oct 2004 18:45:42 -0000	1.26
+++ sfuncs.cpp	20 Oct 2004 22:38:24 -0000	1.27
@@ -112,7 +112,7 @@
 		{66, 0, NULL},
 		{67, 0, NULL},
 		{68, 0, NULL},
-		{69, 0, NULL},
+		{69, 1, OPCODE(SF_enableEscape)},
 		{70, 1, OPCODE(SF_playSound)},
 		{71, 0, NULL},
 		{72, 0, NULL},
@@ -733,6 +733,12 @@
 	return R_SUCCESS;
 }
 
+// Script function #69
+int Script::SF_enableEscape(R_SCRIPTFUNC_PARAMS) {
+	thread->pop();
+	return R_SUCCESS;
+}
+
 static struct {
 	int res;
 	int vol;





More information about the Scummvm-git-logs mailing list