[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.52,2.53 gfx.cpp,2.30,2.31 charset.cpp,2.12,2.13

Max Horn fingolfin at users.sourceforge.net
Mon Mar 3 18:44:24 CET 2003


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

Modified Files:
	scummvm.cpp gfx.cpp charset.cpp 
Log Message:
added some asserts; added a hack that helps the COMI demo

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.52
retrieving revision 2.53
diff -u -d -r2.52 -r2.53
--- scummvm.cpp	3 Mar 2003 22:32:02 -0000	2.52
+++ scummvm.cpp	4 Mar 2003 02:43:42 -0000	2.53
@@ -851,6 +851,8 @@
 	roomResPtr = roomptr = getResourceAddress(rtRoom, _roomResource);
 	if (_features & GF_AFTER_V8)
 		roomResPtr = getResourceAddress(rtRoomScripts, _roomResource);
+	if (!roomptr || !roomResPtr)
+		error("Room %d: data not found (" __FILE__  ":%d)", _roomResource, __LINE__);
 
 	rmhd = (RoomHeader *)findResourceData(MKID('RMHD'), roomptr);
 

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.30
retrieving revision 2.31
diff -u -d -r2.30 -r2.31
--- gfx.cpp	3 Mar 2003 01:53:18 -0000	2.30
+++ gfx.cpp	4 Mar 2003 02:43:43 -0000	2.31
@@ -844,6 +844,7 @@
 void Gdi::drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, const int h,
 										 int stripnr, int numstrip, byte flag)
 {
+	assert(ptr);
 	assert(h > 0);
 	byte *backbuff_ptr, *bgbak_ptr, *smap_ptr;
 	int i;
@@ -2849,6 +2850,9 @@
 
 void Scumm::darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor)
 {
+	if (_roomResource == 0) // FIXME - HACK to get COMI demo working
+		return;
+
 	if (startColor <= endColor) {
 		byte *cptr, *cur;
 		int j;
@@ -2986,8 +2990,6 @@
 
 	_curPalIndex = palindex;
 	pals = getPalettePtr();
-	if (pals == NULL)
-		error("invalid palette %d", palindex);
 	setPaletteFromPtr(pals);
 }
 
@@ -3017,11 +3019,13 @@
 	byte *cptr;
 
 	cptr = getResourceAddress(rtRoom, _roomResource);
+	assert(cptr);
 	if (_CLUT_offs) {
 		cptr += _CLUT_offs;
 	} else {
 		cptr = findPalInPals(cptr + _PALS_offs, _curPalIndex);
 	}
+	assert(cptr);
 	return cptr;
 }
 

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- charset.cpp	15 Jan 2003 03:10:28 -0000	2.12
+++ charset.cpp	4 Mar 2003 02:43:43 -0000	2.13
@@ -394,7 +394,7 @@
 	 : CharsetRenderer(vm)
 {
 	_current = 0;
-	
+
 	for (int i = 0; i < 5; i++) {
 		char fontname[256];
 		sprintf(fontname, "font%d.nut", i);
@@ -417,6 +417,7 @@
 	assert(id < 5);
 	_curId = id;
 	_current = _fr[id];
+	assert(_current);
 }
 
 int CharsetRendererNut::getCharWidth(byte chr)





More information about the Scummvm-git-logs mailing list