[Scummvm-git-logs] scummvm master -> ea524fa7928813585f666d2f64e57253c464bb60
dreammaster
dreammaster at scummvm.org
Sat Apr 21 04:27:38 CEST 2018
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ea524fa792 TINSEL: Fix held items not in either inventory being lost
Commit: ea524fa7928813585f666d2f64e57253c464bb60
https://github.com/scummvm/scummvm/commit/ea524fa7928813585f666d2f64e57253c464bb60
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-20T22:27:33-04:00
Commit Message:
TINSEL: Fix held items not in either inventory being lost
Changed paths:
NEWS
engines/tinsel/dialogs.cpp
diff --git a/NEWS b/NEWS
index 222d57c..e97040a 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,8 @@ 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
+ - In Discworld 1, Held items being released that were never in the Luggage or Rincewind's inventory
+ will now be automatically dropped into the Luggage rather than being lost
Tucker:
- Fixed multiple graphic issues in Bud Tucker in Double Trouble.
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index b5d090e..755b927 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -1907,6 +1907,11 @@ extern void HoldItem(int item, bool bKeepFilm) {
invObj = GetInvObject(item);
SetAuxCursor(invObj->hIconFilm); // and is aux. cursor
}
+
+ // WORKAROUND: If a held item is being removed that's not in either inventory (i.e. it was picked up
+ // but never put in them), then when removing it from being held, drop it in the luggage
+ if (g_heldItem != INV_NOICON && InventoryPos(g_heldItem) == INV_HELDNOTIN)
+ AddToInventory(INV_1, g_heldItem);
}
g_heldItem = item; // Item held
More information about the Scummvm-git-logs
mailing list