[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.293,2.294 resource.cpp,1.258,1.259 scumm.cpp,1.159,1.160 scumm.h,1.459,1.460

Travis Howell kirben at users.sourceforge.net
Sun Aug 29 17:11:04 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4143/scumm

Modified Files:
	gfx.cpp resource.cpp scumm.cpp scumm.h 
Log Message:

Correct resource value, to match original.
Adjust rtLast


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.293
retrieving revision 2.294
diff -u -d -r2.293 -r2.294
--- gfx.cpp	26 Aug 2004 06:08:41 -0000	2.293
+++ gfx.cpp	30 Aug 2004 00:10:26 -0000	2.294
@@ -482,7 +482,7 @@
 	}
 
 	if (_heversion >= 70)
-		room = getResourceAddress(rtRoomStart, _roomResource);
+		room = getResourceAddress(rtRoomImage, _roomResource);
 	else
 		room = getResourceAddress(rtRoom, _roomResource);
 
@@ -550,7 +550,7 @@
 	val = 0;
 
 	if (_heversion >= 70) {
-		byte *room = getResourceAddress(rtRoomStart, _roomResource) + _IM00_offs;
+		byte *room = getResourceAddress(rtRoomImage, _roomResource) + _IM00_offs;
 		if (findResource(MKID('BMAP'), room) != NULL) {
 			if (_fullRedraw) {
 				_BgNeedsRedraw = 0;
@@ -614,7 +614,7 @@
 		gdi._C64ObjectMode = false;
 	}
 	if (_heversion >= 70)
-		room = getResourceAddress(rtRoomStart, _roomResource);
+		room = getResourceAddress(rtRoomImage, _roomResource);
 	else
 		room = getResourceAddress(rtRoom, _roomResource);
 

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- resource.cpp	29 Aug 2004 11:27:15 -0000	1.258
+++ resource.cpp	30 Aug 2004 00:10:36 -0000	1.259
@@ -2033,7 +2033,7 @@
 }
 
 bool ScummEngine::validateResource(const char *str, int type, int idx) const {
-	if (type < rtFirst || type > 19 || (uint) idx >= (uint) res.num[type]) {
+	if (type < rtFirst || type > rtLast || (uint) idx >= (uint) res.num[type]) {
 		warning("%s Illegal Glob type %s (%d) num %d", str, resTypeFromId(type), type, idx);
 		return false;
 	}
@@ -2669,12 +2669,16 @@
 		return "Matrix";
 	case rtBox:
 		return "Box";
-	case rtLast:
-		return "Last";
-	case rtNumTypes:
-		return "NumTypes";
+	case rtObjectName:
+		return "ObjectName";
+	case rtRoomScripts:
+		return "RoomScripts";
+	case rtRoomImage:
+		return "RoomImage";
 	case rtImage:
 		return "Image";
+	case rtNumTypes:
+		return "NumTypes";
 	default:
 		sprintf(buf, "%d", id);
 		return buf;

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- scumm.cpp	28 Aug 2004 14:05:32 -0000	1.159
+++ scumm.cpp	30 Aug 2004 00:10:36 -0000	1.160
@@ -2377,7 +2377,7 @@
 	// Determine the room and room script base address
 	roomResPtr = roomptr = getResourceAddress(rtRoom, _roomResource);
 	if (_heversion >= 70)
-		roomStartPtr = getResourceAddress(rtRoomStart, _roomResource);
+		roomStartPtr = getResourceAddress(rtRoomImage, _roomResource);
 	else if (_version == 8)
 		roomResPtr = getResourceAddress(rtRoomScripts, _roomResource);
 	if (!roomptr || !roomResPtr)

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -d -r1.459 -r1.460
--- scumm.h	28 Aug 2004 14:05:33 -0000	1.459
+++ scumm.h	30 Aug 2004 00:10:36 -0000	1.460
@@ -212,10 +212,9 @@
 	rtBox = 15,
 	rtObjectName = 16,
 	rtRoomScripts = 17,
-	rtRoomStart = 17,
-	rtLast = 17,
 	rtRoomImage = 18,
 	rtImage = 19,
+	rtLast = 19,
 	rtNumTypes = 20
 };
 





More information about the Scummvm-git-logs mailing list