diff options
| -rw-r--r-- | scumm/gfx.cpp | 4 | ||||
| -rw-r--r-- | scumm/resource.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 7866c2dfd8..c810acf36e 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -239,6 +239,8 @@ void Gdi::drawStripToScreen(VirtScreen *vs, int x, int w, int t, int b) void blit(byte *dst, byte *src, int w, int h) { assert(h > 0); + assert(src != NULL); + assert(dst != NULL); do { memcpy(dst, src, w); @@ -539,6 +541,8 @@ void Scumm::cyclePalette() } } +// Perform color cycling on the palManipulate data, too, otherwise +// color cycling will be disturbed by the palette fade. void Scumm::moveMemInPalRes(int start, int end, byte direction) { byte *startptr, *endptr; diff --git a/scumm/resource.cpp b/scumm/resource.cpp index af803ba169..8c4399722b 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -764,7 +764,7 @@ byte *Scumm::getResourceAddress(int type, int idx) CHECK_HEAP validateResource("getResourceAddress", type, idx); if (!res.address[type]) { - debug(1, "getResourceAddress(%s,%d), res.address[type] == NULL", resTypeFromId(type), idx); + debug(9, "getResourceAddress(%s,%d), res.address[type] == NULL", resTypeFromId(type), idx); return NULL; } @@ -773,7 +773,7 @@ byte *Scumm::getResourceAddress(int type, int idx) } if (!(ptr = (byte *)res.address[type][idx])) { - debug(1, "getResourceAddress(%s,%d) == NULL", resTypeFromId(type), idx); + debug(9, "getResourceAddress(%s,%d) == NULL", resTypeFromId(type), idx); return NULL; } |