[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.266,1.267 scumm.cpp,1.179,1.180

[Travis Howell]

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

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

Caused crash.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- resource.cpp	8 Sep 2004 06:38:31 -0000	1.266
+++ resource.cpp	8 Sep 2004 06:46:52 -0000	1.267
@@ -535,7 +535,6 @@
 				_fileHandle.read(_objectStateTable, num);
 				_fileHandle.read(_objectOwnerTable, num);
 				_fileHandle.read(_objectRoomTable, num);
-				// FIXME more DOBJ bits left to sort out here
 			} else {
 				_fileHandle.read(_objectOwnerTable, num);
 				for (i = 0; i < num; i++) {

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- scumm.cpp	8 Sep 2004 05:58:36 -0000	1.179
+++ scumm.cpp	8 Sep 2004 06:46:52 -0000	1.180
@@ -2304,7 +2304,8 @@
 	if (_version < 7) {
 		for (i = 0; i < 256; i++) {
 			_roomPalette[i] = i;
-			_shadowPalette[i] = i;
+			if (_shadowPalette)
+				_shadowPalette[i] = i;
 		}
 		if (_features & GF_SMALL_HEADER)
 			setDirtyColors(0, 255);