[Scummvm-git-logs] scummvm branch-2-5 -> c2a5dc15272a9b4bda4ae659e69b870e4a2a20e0

[dreammaster]

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

Summary:
68836bf8b7 SHERLOCK: Fix inventory redraw after looking at room object (#10836)
c632aec161 SHERLOCK: Fix only first page of description being shown
c2a5dc1527 NEWS: Mention inventory glitch looking at items with inventory open


Commit: 68836bf8b7d7ffb4eb972c7048d0e5ac11899c01
    https://github.com/scummvm/scummvm/commit/68836bf8b7d7ffb4eb972c7048d0e5ac11899c01
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-12-10T20:09:53-08:00

Commit Message:
SHERLOCK: Fix inventory redraw after looking at room object (#10836)

Instead of using _backBuffer1 directly, we should draw the inventory
icons to the current back buffer. This makes a difference in cases where
the engine has activated back buffer 2. Referring to _backBuffer2
directly should still be ok. This fixes inventory redrawing after
examining a room object.

Changed paths:
    engines/sherlock/scalpel/scalpel_inventory.cpp


diff --git a/engines/sherlock/scalpel/scalpel_inventory.cpp b/engines/sherlock/scalpel/scalpel_inventory.cpp
index 07659b41f2..8a86ec6546 100644
--- a/engines/sherlock/scalpel/scalpel_inventory.cpp
+++ b/engines/sherlock/scalpel/scalpel_inventory.cpp
@@ -251,7 +251,7 @@ void ScalpelInventory::putInv(InvSlamMode slamIt) {
 	// Iterate through displaying up to 6 objects at a time
 	for (int idx = _invIndex; idx < _holdings && (idx - _invIndex) < (int)_invShapes.size(); ++idx) {
 		int itemNum = idx - _invIndex;
-		Surface &bb = slamIt == SLAM_SECONDARY_BUFFER ? screen._backBuffer2 : screen._backBuffer1;
+		Surface &bb = (slamIt == SLAM_SECONDARY_BUFFER) ? screen._backBuffer2 : *screen.getBackBuffer();
 		Common::Rect r(8 + itemNum * 52, 165, 51 + itemNum * 52, 194);
 
 		// Draw the background


Commit: c632aec161c45542f9f6dce65266fce5f73b9d65
    https://github.com/scummvm/scummvm/commit/c632aec161c45542f9f6dce65266fce5f73b9d65
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-12-10T20:10:06-08:00

Commit Message:
SHERLOCK: Fix only first page of description being shown

When examining a room object with a description that spans multiple
pages, only the first page was shown if the inventory was open at the
same time. This bug happens in the original too. Hopefully fixing it
does not cause any unwanted side effects.

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.cpp


diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index e6e2ac8c95..cc9d7c2691 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -1266,12 +1266,13 @@ void ScalpelUserInterface::doLookControl() {
 	_keyboardInput = (_keyPress != '\0');
 
 	if (events._released || events._rightReleased || _keyboardInput) {
+		// Is there any remaining text to display?
+		if (!_descStr.empty()) {
+			printObjectDesc(_descStr, false);
+		}
 		// Is an inventory object being looked at?
-		if (!_invLookFlag) {
-			// Is there any remaining text to display?
-			if (!_descStr.empty()) {
-				printObjectDesc(_descStr, false);
-			} else if (!_lookHelp) {
+		else if (!_invLookFlag) {
+			if (!_lookHelp) {
 				// Need to close the window and depress the Look button
 				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
 				offsetButton3DO(pt, 0);


Commit: c2a5dc15272a9b4bda4ae659e69b870e4a2a20e0
    https://github.com/scummvm/scummvm/commit/c2a5dc15272a9b4bda4ae659e69b870e4a2a20e0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-12-10T20:10:17-08:00

Commit Message:
NEWS: Mention inventory glitch looking at items with inventory open

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 1d8e845c6d..80f2ba6efd 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -41,6 +41,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fix bell pull sound in Serrated Scalpel.
    - Fix inventory not updating in Serrated Scalpel after examining watch.
    - Fix fog overlay at Cleopatra's Needle in Rose Tattoo.
+   - Fix graphic issues in Serrated Scalpel looking at items whilst inventory is open.
 
  TwinE:
    - Numerous bugfixes and stability improvements.