aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel/cursor.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2018-04-18 20:34:01 -0400
committerPaul Gilbert2018-04-18 21:06:08 -0400
commit4c65db13df314af4dcd5a9fb75f33ec81f9634fd (patch)
tree07c44920fdee14bac898c11a4df4fa9f87c37a4d /engines/tinsel/cursor.cpp
parent9f6b4a1583499bf692c9dff46b442ea4dec22f02 (diff)
downloadscummvm-rg350-4c65db13df314af4dcd5a9fb75f33ec81f9634fd.tar.gz
scummvm-rg350-4c65db13df314af4dcd5a9fb75f33ec81f9634fd.tar.bz2
scummvm-rg350-4c65db13df314af4dcd5a9fb75f33ec81f9634fd.zip
TINSEL: Fix loading DW1 savegames with a held item
Diffstat (limited to 'engines/tinsel/cursor.cpp')
-rw-r--r--engines/tinsel/cursor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp
index e69031d572..c23e4f2845 100644
--- a/engines/tinsel/cursor.cpp
+++ b/engines/tinsel/cursor.cpp
@@ -375,6 +375,10 @@ void SetAuxCursor(SCNHANDLE hFilm) {
DelAuxCursor(); // Get rid of previous
+ // WORKAROUND: There's no palette when loading a DW1 savegame with a held item, so exit if so
+ if (!BgPal())
+ return;
+
GetCursorXY(&x, &y, false); // Note: also waits for cursor to appear
pim = GetImageFromFilm(hFilm, 0, &pfr, &pmi, &pfilm);// Get pointer to image