[Scummvm-git-logs] scummvm master -> 2175ee951ab2a62a0e3a3c6c28341fe447514072

dreammaster noreply at scummvm.org
Wed Dec 8 04:01:10 UTC 2021


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:
2175ee951a SHERLOCK: SS: Fix updating inventory after examining watch


Commit: 2175ee951ab2a62a0e3a3c6c28341fe447514072
    https://github.com/scummvm/scummvm/commit/2175ee951ab2a62a0e3a3c6c28341fe447514072
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-12-07T20:00:58-08:00

Commit Message:
SHERLOCK: SS: Fix updating inventory after examining watch

Changed paths:
    NEWS.md
    engines/sherlock/talk.cpp


diff --git a/NEWS.md b/NEWS.md
index 5f30fda0e7..15f815ccd2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -43,6 +43,7 @@ For a more comprehensive changelog of the latest experimental code, see:
     - Fix character animation in Rose Tattoo.
     - Fix glitch opening map in Rose Tattoo.
     - Fix bell pull sound in Serrated Scalpel.
+	- Fix inventory not updating in Serrated Scalpel after examining watch.
 
  Xeen:
    - Fix crash on startup loading constants from xeen.ccs.
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 4253239640..7809318b57 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -435,9 +435,9 @@ void Talk::talkTo(const Common::String filename) {
 					}
 				} else {
 					ui._menuMode = static_cast<Tattoo::TattooScene *>(_vm->_scene)->_labTableScene ? LAB_MODE : STD_MODE;
+					ui.banishWindow();
 				}
 
-				ui.banishWindow();
 				break;
 			}
 		}




More information about the Scummvm-git-logs mailing list