[Scummvm-cvs-logs] CVS: scummvm/saga gamedesc.cpp,1.4,1.5 resfile.cpp,1.3,1.4

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Tue Mar 16 00:37:00 CET 2004


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

Modified Files:
	gamedesc.cpp resfile.cpp 
Log Message:
Fixed warnings. I hope I didn't break anything!


Index: gamedesc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gamedesc.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gamedesc.cpp	15 Mar 2004 01:59:06 -0000	1.4
+++ gamedesc.cpp	16 Mar 2004 08:25:46 -0000	1.5
@@ -164,7 +164,7 @@
 	248, 255  /* Overlay palette start index and length */
 };
 
-R_GAME_RESOURCEINFO IHNM_Resources[] = {
+R_GAME_RESOURCEINFO IHNM_Resources = {
 	IHNM_SCENE_LUT,  /* Scene lookup table RN */
 	IHNM_SCRIPT_LUT, /* Script lookup table RN */
 	
@@ -268,7 +268,7 @@
 		  
 		0,
 
-		IHNM_Resources,
+		&IHNM_Resources,
 	  
 		ARRAYSIZE(IHNMDEMO_GameFiles),
 		IHNMDEMO_GameFiles,
@@ -292,7 +292,7 @@
 			  
 		1,
 
-		IHNM_Resources,
+		&IHNM_Resources,
 
 		ARRAYSIZE(IHNMCD_GameFiles),
 		IHNMCD_GameFiles,

Index: resfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resfile.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resfile.cpp	15 Mar 2004 01:59:06 -0000	1.3
+++ resfile.cpp	16 Mar 2004 08:25:46 -0000	1.4
@@ -129,7 +129,7 @@
 
 	assert(res != NULL && res_len != NULL);
 	*res = NULL;
-	*res_len = NULL;
+	*res_len = 0;
 
 	if (!R_PBOUNDS(rn, _resTblCt)) {
 		return false;
@@ -151,7 +151,7 @@
 
 	*res = new_res;
 	*res_len = new_res_len;
-		
+
 	return true;
 }
 





More information about the Scummvm-git-logs mailing list