[Scummvm-cvs-logs] CVS: scummvm/saga expr.cpp,1.2,1.3 scene.cpp,1.2,1.3

[Torbj?rn Andersson]

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

Modified Files:
	expr.cpp scene.cpp 
Log Message:
Fixed warnings. At the time of writing, only xmidi.cpp causes warnings for
me now, but I'm not sure how to fix those.


Index: expr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/expr.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- expr.cpp	25 Apr 2004 14:42:13 -0000	1.2
+++ expr.cpp	27 Apr 2004 10:01:14 -0000	1.3
@@ -107,7 +107,7 @@
 
 	int i;
 	int in_char;
-	int equ_offset;
+	int equ_offset = 0;
 	int rvalue_offset;
 
 	char *lvalue_str;
@@ -322,7 +322,7 @@
 {
 
 	int string_len;
-	char *str_p;
+	char *str_p = NULL;
 	char *term_p;
 
 	const char *scan_p;

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scene.cpp	25 Apr 2004 14:42:14 -0000	1.2
+++ scene.cpp	27 Apr 2004 10:01:15 -0000	1.3
@@ -114,7 +114,7 @@
 	/* Load scene lookup table
 	 * \*------------------------------------------------------------ */
 	R_printf(R_STDOUT,
-	    "SCENE_Init(): Loading scene LUT from resource %d.\n",
+	    "SCENE_Init(): Loading scene LUT from resource %ld.\n",
 	    gs_desc.scene_lut_rn);
 
 	result = RSC_LoadResource(SceneModule.scene_ctxt,
@@ -575,7 +575,7 @@
 		SceneModule.scene_rn = res_number;
 		assert(SceneModule.scene_rn != 0);
 
-		R_printf(R_STDOUT, "Loading scene resource %d:\n", res_number);
+		R_printf(R_STDOUT, "Loading scene resource %ld:\n", res_number);
 
 		if (LoadSceneDescriptor(res_number) != R_SUCCESS) {
 			R_printf(R_STDERR,