diff options
| author | Paul Gilbert | 2018-04-18 20:34:01 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-04-18 21:06:08 -0400 |
| commit | 4c65db13df314af4dcd5a9fb75f33ec81f9634fd (patch) | |
| tree | 07c44920fdee14bac898c11a4df4fa9f87c37a4d | |
| parent | 9f6b4a1583499bf692c9dff46b442ea4dec22f02 (diff) | |
| download | scummvm-rg350-4c65db13df314af4dcd5a9fb75f33ec81f9634fd.tar.gz scummvm-rg350-4c65db13df314af4dcd5a9fb75f33ec81f9634fd.tar.bz2 scummvm-rg350-4c65db13df314af4dcd5a9fb75f33ec81f9634fd.zip | |
TINSEL: Fix loading DW1 savegames with a held item
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | engines/tinsel/cursor.cpp | 4 |
2 files changed, 7 insertions, 0 deletions
@@ -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 |