[Scummvm-cvs-logs] scummvm master -> bf90d3602422bed51677c4aafd1b54b4c2860631

clone2727 clone2727 at gmail.com
Sat Jul 12 05:44:04 CEST 2014


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

Summary:
3ddf04465e MADE: Error out when a blocks file fails to open
9b282326aa MADE: Error out when a picture cannot be found
bf90d36024 MADE: Print v1 database debugging at level 1 instead of all the time


Commit: 3ddf04465eb8a7d1e6ad6ade374bc30eecdd72c0
    https://github.com/scummvm/scummvm/commit/3ddf04465eb8a7d1e6ad6ade374bc30eecdd72c0
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-07-11T23:29:37-04:00

Commit Message:
MADE: Error out when a blocks file fails to open

Changed paths:
    engines/made/resource.cpp



diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp
index 1bb328c..2c75965 100644
--- a/engines/made/resource.cpp
+++ b/engines/made/resource.cpp
@@ -441,7 +441,8 @@ void ResourceReader::openResourceBlocks() {
 }
 
 void ResourceReader::openResourceBlock(const char *filename, Common::File *blockFile, uint32 resType) {
-	blockFile->open(filename);
+	if (!blockFile->open(filename))
+		error("Failed to open '%s'", filename);
 
 	blockFile->readUint16LE(); // Skip unused
 	uint16 count = blockFile->readUint16LE();


Commit: 9b282326aa0b358ab9f962578bfaa58bce20c925
    https://github.com/scummvm/scummvm/commit/9b282326aa0b358ab9f962578bfaa58bce20c925
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-07-11T23:32:44-04:00

Commit Message:
MADE: Error out when a picture cannot be found

Changed paths:
    engines/made/screen.cpp



diff --git a/engines/made/screen.cpp b/engines/made/screen.cpp
index c27b781..edccb68 100644
--- a/engines/made/screen.cpp
+++ b/engines/made/screen.cpp
@@ -368,6 +368,9 @@ uint16 Screen::drawFlex(uint16 flexIndex, int16 x, int16 y, int16 flipX, int16 f
 		return 0;
 
 	PictureResource *flex = _vm->_res->getPicture(flexIndex);
+	if (!flex)
+		error("Failed to find picture %d", flexIndex);
+
 	Graphics::Surface *sourceSurface = flex->getPicture();
 
 	drawSurface(sourceSurface, x, y, flipX, flipY, mask, clipInfo);


Commit: bf90d3602422bed51677c4aafd1b54b4c2860631
    https://github.com/scummvm/scummvm/commit/bf90d3602422bed51677c4aafd1b54b4c2860631
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-07-11T23:35:38-04:00

Commit Message:
MADE: Print v1 database debugging at level 1 instead of all the time

Changed paths:
    engines/made/database.cpp



diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index 85a8a5c..a9855ba 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -456,7 +456,7 @@ void GameDatabaseV2::load(Common::SeekableReadStream &sourceS) {
 		for (int section = 0; section < 2; section++) {
 			while (!sourceS.eos()) {
 				int16 objIndex = sourceS.readUint16LE();
-				debug("objIndex = %04X; section = %d", objIndex, section);
+				debug(1, "objIndex = %04X; section = %d", objIndex, section);
 				if (objIndex == 0)
 					break;
 				Object *obj = new ObjectV1();






More information about the Scummvm-git-logs mailing list