diff options
| author | Travis Howell | 2004-09-08 06:46:52 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-09-08 06:46:52 +0000 |
| commit | fc60379b216390571236145baddf65184a4d3c22 (patch) | |
| tree | 9eae32694109c51ce1ab4ffc6274a3918b735011 | |
| parent | c9a4f23e51aa190b5fe4c52d1c8a38b0560d8f71 (diff) | |
| download | scummvm-rg350-fc60379b216390571236145baddf65184a4d3c22.tar.gz scummvm-rg350-fc60379b216390571236145baddf65184a4d3c22.tar.bz2 scummvm-rg350-fc60379b216390571236145baddf65184a4d3c22.zip | |
Caused crash.
svn-id: r14956
| -rw-r--r-- | scumm/resource.cpp | 1 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index cc04573acc..3af952ba5f 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -535,7 +535,6 @@ void ScummEngine::readIndexFile() { _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++) { diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 4684cb12d9..eed8c6ddfd 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -2304,7 +2304,8 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { 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); |