[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.315,1.316 scummvm.cpp,2.453,2.454 resource.cpp,1.167,1.168

[Max Horn]

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

Modified Files:
	scumm.h scummvm.cpp resource.cpp 
Log Message:
added tag2str helper function

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- scumm.h	13 Oct 2003 12:56:53 -0000	1.315
+++ scumm.h	17 Oct 2003 16:28:29 -0000	1.316
@@ -1210,6 +1210,8 @@
 
 void checkRange(int max, int min, int no, const char *str);
 
+const char *tag2str(uint32 tag);
+
 } // End of namespace Scumm
 
 #endif

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.453
retrieving revision 2.454
diff -u -d -r2.453 -r2.454
--- scummvm.cpp	17 Oct 2003 15:38:55 -0000	2.453
+++ scummvm.cpp	17 Oct 2003 16:28:29 -0000	2.454
@@ -2625,6 +2625,16 @@
 	return toSimpleDir(1, temp) * 45;
 }
 
+const char *tag2str(uint32 tag) {
+	static char str[5];
+	str[0] = (char)(tag >> 24);
+	str[1] = (char)(tag >> 16);
+	str[2] = (char)(tag >> 8);
+	str[3] = (char)tag;
+	str[4] = '\0';
+	return str;
+}
+
 } // End of namespace Scumm
 
 using namespace Scumm;

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- resource.cpp	12 Oct 2003 19:10:16 -0000	1.167
+++ resource.cpp	17 Oct 2003 16:28:29 -0000	1.168
@@ -426,11 +426,7 @@
 			break;
 
 		default:
-			error("Bad ID %c%c%c%c found in directory!",
-						(byte)blocktype,
-						(byte)(blocktype >> 8),
-						(byte)(blocktype >> 16),
-						(byte)(blocktype >> 24));
+			error("Bad ID '%s' found in directory!", tag2str(blocktype));
 			return;
 		}
 	}
@@ -712,10 +708,7 @@
 	basetag = fileReadDword();
 	total_size = _fileHandle.readUint32BE();
 
-	debug(8, "  basetag: %c%c%c%c, total_size=%d",
-				(char)((basetag >> 24) & 0xff),
-				(char)((basetag >> 16) & 0xff),
-				(char)((basetag >> 8) & 0xff), (char)(basetag & 0xff), total_size);
+	debug(8, "  basetag: %s, total_size=%d", tag2str(TO_BE_32(basetag)), total_size);
 
 	if (basetag == MKID('MIDI') || basetag == MKID('iMUS')) {
 		if (_midiDriver != MD_PCSPK && _midiDriver != MD_PCJR) {
@@ -768,9 +761,7 @@
 			if ((_midiDriver == MD_PCSPK || _midiDriver == MD_PCJR) && pri != 11)
 				pri = -1;
 
-			debug(8, "    tag: %c%c%c%c, total_size=%d, pri=%d",
-						(char)((tag >> 24) & 0xff),
-						(char)((tag >> 16) & 0xff), (char)((tag >> 8) & 0xff), (char)(tag & 0xff), size, pri);
+			debug(8, "    tag: %s, total_size=%d, pri=%d", tag2str(TO_BE_32(tag)), size, pri);
 
 
 			if (pri > best_pri) {
@@ -1034,11 +1025,7 @@
 	case MKID('BONG'): return 115;
 	case MKID('BASS'): transpose = -24; return 35;
 	default:
-		error("Unknown Mac0 instrument %c%c%c%c found",
-					(byte)type,
-					(byte)(type >> 8),
-					(byte)(type >> 16),
-					(byte)(type >> 24));
+		error("Unknown Mac0 instrument %s found", tag2str(type));
 	}
 }
 
@@ -2311,8 +2298,7 @@
 
 		size = READ_BE_UINT32(searchin + 4);
 		if ((int32)size <= 0) {
-			error("(%c%c%c%c) Not found in %d... illegal block len %d",
-						tag & 0xFF, (tag >> 8) & 0xFF, (tag >> 16) & 0xFF, (tag >> 24) & 0xFF, 0, size);
+			error("(%s) Not found in %d... illegal block len %d", tag2str(tag), 0, size);
 			return NULL;
 		}
 
@@ -2344,8 +2330,7 @@
 			return searchin;
 
 		if ((int32)size <= 0) {
-			error("(%c%c%c%c) Not found in %d... illegal block len %d",
-						tag & 0xFF, (tag >> 8) & 0xFF, (tag >> 16) & 0xFF, (tag >> 24) & 0xFF, 0, size);
+			error("(%s) Not found in %d... illegal block len %d", tag2str(tag), 0, size);
 			return NULL;
 		}