diff options
Diffstat (limited to 'engines/scumm/cursor.cpp')
| -rw-r--r-- | engines/scumm/cursor.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 367247544b..1dcb96d1e8 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -22,7 +22,6 @@ * */ - #include "common/system.h" #include "common/util.h" #include "graphics/cursorman.h" @@ -322,12 +321,9 @@ void ScummEngine_v6::useBompCursor(const byte *im, int width, int height) { } void ScummEngine_v5::redefineBuiltinCursorFromChar(int index, int chr) { - // Cursor image in both Looms are based on images from charset. - if (_game.id != GID_LOOM) { - // FIXME: Actually: is this opcode ever called by a non-Loom game? - // Which V3-V5 game besides Loom makes use of custom cursors, ever? - error("V3--V5 SO_CURSOR_IMAGE(%d,%d) called - tell Fingolfin where you saw this!", index, chr); - } + // Cursor image in both Loom versions are based on images from charset. + // This function is *only* supported for Loom! + assert(_game.id == GID_LOOM); assert(index >= 0 && index < 4); @@ -367,11 +363,8 @@ void ScummEngine_v5::redefineBuiltinCursorFromChar(int index, int chr) { void ScummEngine_v5::redefineBuiltinCursorHotspot(int index, int x, int y) { // Cursor image in both Looms are based on images from charset. - if (_game.id != GID_LOOM) { - // FIXME: Actually: is this opcode ever called by a non-Loom game? - // Which V3-V5 game besides Loom makes use of custom cursors, ever? - error("V3--V5 SO_CURSOR_HOTSPOT(%d,%d,%d) called - tell Fingolfin where you saw this!", index, x, y); - } + // This function is *only* supported for Loom! + assert(_game.id == GID_LOOM); assert(index >= 0 && index < 4); |