[Scummvm-cvs-logs] scummvm master -> 7d82cac910533eb965fa3edc0630db74d0757d8b

[m-kiewitz]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2d45bbd1ea SCI: debugger diskdump is now able to dump '*'
7d82cac910 Merge branch 'master' of github.com:scummvm/scummvm


Commit: 2d45bbd1ea0297370e687db5520e34aa537c5569
    https://github.com/scummvm/scummvm/commit/2d45bbd1ea0297370e687db5520e34aa537c5569
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-06-01T01:23:44+02:00

Commit Message:
SCI: debugger diskdump is now able to dump '*'

dumps all resources of given type

Changed paths:
    engines/sci/console.cpp



diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 1c4228e..565e975 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -660,32 +660,48 @@ bool Console::cmdRegisters(int argc, const char **argv) {
 }
 
 bool Console::cmdDiskDump(int argc, const char **argv) {
+	int resNumFrom = 0;
+	int resNumTo = 0;
+	int resNumCur = 0;
+	
 	if (argc != 3) {
 		debugPrintf("Dumps the specified resource to disk as a patch file\n");
 		debugPrintf("Usage: %s <resource type> <resource number>\n", argv[0]);
+		debugPrintf("       <resource number> may be '*' to dump all resources of given type\n");
 		cmdResourceTypes(argc, argv);
 		return true;
 	}
+	
+	if (strcmp(argv[2], "*") == 0) {
+		resNumFrom = 0;
+		resNumTo   = 65535;
+	} else {
+		resNumFrom = atoi(argv[2]);
+		resNumTo   = resNumFrom;
+	}
 
-	int resNum = atoi(argv[2]);
 	ResourceType res = parseResourceType(argv[1]);
 
 	if (res == kResourceTypeInvalid)
 		debugPrintf("Resource type '%s' is not valid\n", argv[1]);
 	else {
-		Resource *resource = _engine->getResMan()->findResource(ResourceId(res, resNum), 0);
-		if (resource) {
-			char outFileName[50];
-			sprintf(outFileName, "%s.%03d", getResourceTypeName(res), resNum);
-			Common::DumpFile *outFile = new Common::DumpFile();
-			outFile->open(outFileName);
-			resource->writeToStream(outFile);
-			outFile->finalize();
-			outFile->close();
-			delete outFile;
-			debugPrintf("Resource %s.%03d (located in %s) has been dumped to disk\n", argv[1], resNum, resource->getResourceLocation().c_str());
-		} else {
-			debugPrintf("Resource %s.%03d not found\n", argv[1], resNum);
+		for (resNumCur = resNumFrom; resNumCur <= resNumTo; resNumCur++) {
+			Resource *resource = _engine->getResMan()->findResource(ResourceId(res, resNumCur), 0);
+			if (resource) {
+				char outFileName[50];
+				sprintf(outFileName, "%s.%03d", getResourceTypeName(res), resNumCur);
+				Common::DumpFile *outFile = new Common::DumpFile();
+				outFile->open(outFileName);
+				resource->writeToStream(outFile);
+				outFile->finalize();
+				outFile->close();
+				delete outFile;
+				debugPrintf("Resource %s.%03d (located in %s) has been dumped to disk\n", argv[1], resNumCur, resource->getResourceLocation().c_str());
+			} else {
+				if (resNumFrom == resNumTo) {
+					debugPrintf("Resource %s.%03d not found\n", argv[1], resNumCur);
+				}
+			}
 		}
 	}
 


Commit: 7d82cac910533eb965fa3edc0630db74d0757d8b
    https://github.com/scummvm/scummvm/commit/7d82cac910533eb965fa3edc0630db74d0757d8b
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-06-01T01:25:12+02:00

Commit Message:
Merge branch 'master' of github.com:scummvm/scummvm

Changed paths:
    engines/cruise/actor.cpp
    engines/cruise/background.cpp
    engines/cruise/cruise_main.cpp
    engines/cruise/ctp.cpp
    engines/cruise/dataLoader.cpp
    engines/cruise/decompiler.cpp
    engines/cruise/font.cpp
    engines/cruise/function.cpp
    engines/cruise/gfxModule.cpp
    engines/cruise/linker.cpp
    engines/cruise/mainDraw.cpp
    engines/cruise/overlay.cpp
    engines/cruise/polys.cpp
    engines/cruise/saveload.cpp
    engines/cruise/script.cpp
    engines/cruise/sound.cpp
    engines/cruise/volume.cpp