[Scummvm-git-logs] scummvm master -> da79ac1d4212f0fb56e2cd5f310ab1e9bd879ff6

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4c65db13df TINSEL: Fix loading DW1 savegames with a held item
da79ac1d42 TINSEL: Fix hang in DW1 GRA when using items on Temple big hammer


Commit: 4c65db13df314af4dcd5a9fb75f33ec81f9634fd
    https://github.com/scummvm/scummvm/commit/4c65db13df314af4dcd5a9fb75f33ec81f9634fd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-18T21:06:08-04:00

Commit Message:
TINSEL: Fix loading DW1 savegames with a held item

Changed paths:
    NEWS
    engines/tinsel/cursor.cpp


diff --git a/NEWS b/NEWS
index 25e4f4d..4dc5f8b 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 e69031d..c23e4f2 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


Commit: da79ac1d4212f0fb56e2cd5f310ab1e9bd879ff6
    https://github.com/scummvm/scummvm/commit/da79ac1d4212f0fb56e2cd5f310ab1e9bd879ff6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-18T21:06:08-04:00

Commit Message:
TINSEL: Fix hang in DW1 GRA when using items on Temple big hammer

Changed paths:
    NEWS
    engines/tinsel/pcode.cpp


diff --git a/NEWS b/NEWS
index 4dc5f8b..222d57c 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  Tinsel:
    - Fix loading Discworld 1 savegames from the launcher where Rincewind had a held item
+   - Script patch for hang in Discworld 1 GRA using items on Temple big hammer
 
  Tucker:
    - Fixed multiple graphic issues in Bud Tucker in Double Trouble.
diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp
index dc19f39..8899eea 100644
--- a/engines/tinsel/pcode.cpp
+++ b/engines/tinsel/pcode.cpp
@@ -156,6 +156,7 @@ static const byte fragment14[] = {OP_LIBCALL | OPSIZE8, 58,
 		OP_IMM, FRAGMENT_DWORD((42 << 23)), OP_ONE, OP_ZERO, OP_LIBCALL | OPSIZE8, 44,
 		OP_LIBCALL | OPSIZE8, 97, OP_JUMP | OPSIZE16, FRAGMENT_WORD(2220)
 };
+static const byte fragment15[] = { OP_JMPFALSE | OPSIZE16, FRAGMENT_WORD(154) };
 
 #undef FRAGMENT_WORD
 
@@ -226,6 +227,9 @@ const WorkaroundEntry workaroundList[] = {
 	// quitting the game when no user input happens for a while
 	{TINSEL_V1, true, true, Common::kPlatformPSX, 0, 2186, sizeof(fragment14), fragment14},
 
+	// DW1-GRA: Fixes hang in Temple, when trying to use items on the big hammer
+	{TINSEL_V1, false, false, Common::kPlatformUnknown, 276915849, 0x98, sizeof(fragment15), fragment15},
+
 	{TINSEL_V0, false, false, Common::kPlatformUnknown, 0, 0, 0, NULL}
 };