[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.62,1.63 debugger.cpp,1.27,1.28

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv32093

Modified Files:
	resource.cpp debugger.cpp 
Log Message:
pedantic checks

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- resource.cpp	28 Apr 2003 05:54:54 -0000	1.62
+++ resource.cpp	28 Apr 2003 13:16:36 -0000	1.63
@@ -1236,7 +1236,9 @@
 }
 
 byte *Scumm::findResourceData(uint32 tag, byte *ptr) {
-	if (_features & GF_SMALL_HEADER)
+	if (_features & GF_OLD_BUNDLE)
+		error("findResourceData must not be used in GF_OLD_BUNDLE games");
+	else if (_features & GF_SMALL_HEADER)
 		ptr = findResourceSmall(tag, ptr, 0);
 	else
 		ptr = findResource(tag, ptr, 0);

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- debugger.cpp	25 Apr 2003 13:13:16 -0000	1.27
+++ debugger.cpp	28 Apr 2003 13:16:37 -0000	1.28
@@ -433,7 +433,7 @@
 	uint32 size;
 	int resnum;
 	
-	if (argc < 3) {
+	if (argc != 3) {
 		Debug_Printf("Syntax: importres <restype> <filename> <resnum>\n");
 		return true;
 	}