aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--engines/tinsel/cursor.cpp4
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 25e4f4d758..4dc5f8b119 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,9 @@ For a more comprehensive changelog of the latest experimental code, see:
- Improved Audio quality in Humongous Entertainment games by using the Miles AdLib driver.
- Fixed possible stack overflows in The Dig and Full Throttle.
+ Tinsel:
+ - Fix loading Discworld 1 savegames from the launcher where Rincewind had a held item
+
Tucker:
- Fixed multiple graphic issues in Bud Tucker in Double Trouble.
- Fixed multiple issues with font and subtitle rendering.
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