Ticket #7914: resource_debug.patch

resource.cpp

@@ -341 +341 @@
         int num;
         int i;
         
-        debug(9, "readResTypeList(%d,%x,%s)",id,FROM_LE_32(tag),name);
+        debug(9, "readResTypeList(%s,%x,%s)",res.name[id],FROM_LE_32(tag),name);
         
         num = fileReadWordLE();
 
@@ -367 +367 @@
 
 
 void Scumm::allocResTypeData(int id, uint32 tag, int num, const char *name, int mode) {
-        debug(9, "allocResTypeData(%d,%x,%d,%s,%d)",id,FROM_LE_32(tag),num,name,mode);
+        debug(9, "allocResTypeData(%s,%x,%d,%d)",name,FROM_LE_32(tag),num,mode);
         assert(id>=0 && id<sizeof(res.mode)/sizeof(res.mode[0]));
 
         if (num>=512) {
@@ -410 +410 @@
 void Scumm::ensureResourceLoaded(int type, int i) {
         void *addr;
 
-        debug(9, "ensureResourceLoaded(%d,%d)", type, i);
+        debug(9, "ensureResourceLoaded(%s,%d)",res.name[type], i);
 
         if (type==rtRoom && i>127) {
                 i = _resourceMapper[i&127];
@@ -434 +434 @@
         uint32 fileOffs;
         uint32 size, tag;
         
-        debug(9, "loadResource(%d,%d)", type,index);
+        debug(9, "loadResource(%s,%d)",res.name[type], index);
 
         roomNr = getResourceRoomNr(type, index);
         if (roomNr == 0 || index >= res.num[type]) {
@@ -464 +464 @@
                         tag = fileReadDword();
 
                         if (tag != res.tags[type]) {
-                                error("%s %d not in room %d at %d+%d", 
-                                        res.name[type], type, roomNr, _fileOffset, fileOffs);
+                                error("%s not in room %d at %d+%d", 
+                                        res.name[type], roomNr, _fileOffset, fileOffs);
                         }
 
                         size = fileReadDwordBE();
@@ -496 +496 @@
         byte *ptr;
         int i;
 
-        debug(9, "readSoundResource(%d,%d)", type, index);
+        debug(9, "readSoundResource(%s,%d)",res.name[type], index);
 
         resStart = 0;
 
@@ -541 +541 @@
 byte *Scumm::getResourceAddress(int type, int index) {
         byte *ptr;
 
-        debug(9, "getResourceAddress(%d,%d)", type, index);
+        debug(9, "getResourceAddress(%s,%d)",res.name[type], index);
 
         CHECK_HEAP
 
@@ -583 +583 @@
 
         CHECK_HEAP
 
-        debug(9, "createResource(%d,%d,%d)", type, index,size);
+        debug(9, "createResource(%s,%d,%d)",res.name[type], index,size);
 
         if (size > 65536*4+37856)
                 error("Invalid size allocating");
@@ -610 +610 @@
 
 void Scumm::validateResource(const char *str, int type, int index) {
         if (type<rtFirst || type>rtLast || (uint)index >= (uint)res.num[type]) {
-                error("%d Illegal Glob type %d num %d", str, type, index);
+                error("%d Illegal Glob type %s num %d", str, res.name[type], index);
         }
 }
 
 void Scumm::nukeResource(int type, int index) {
         byte *ptr;
 
-        debug(9, "nukeResource(%d,%d)", type, index);
+        debug(9, "nukeResource(%s,%d)",res.name[type], index);
 
         CHECK_HEAP
         assert( res.address[type] );