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

[OMGPizzaGuy]

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:
dd6ab88c4a ULTIMA8: Allow close of container gumps when in stasis.


Commit: dd6ab88c4afb472158209c4a12b6ff9709c030e8
    https://github.com/scummvm/scummvm/commit/dd6ab88c4afb472158209c4a12b6ff9709c030e8
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-05-10T18:27:07-05:00

Commit Message:
ULTIMA8: Allow close of container gumps when in stasis.
The Ancient Ones cutscene does not close gumps, and this behavior matches the original game. Fixes #14866

Changed paths:
    engines/ultima/ultima8/gumps/container_gump.cpp


diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp
index 425b4be8dc6..f247132ddbb 100644
--- a/engines/ultima/ultima8/gumps/container_gump.cpp
+++ b/engines/ultima/ultima8/gumps/container_gump.cpp
@@ -390,13 +390,19 @@ void ContainerGump::onMouseDouble(int button, int32 mx, int32 my) {
 		if (item) {
 			debugC(kDebugObject, "%s", item->dumpInfo().c_str());
 
+			if (objID == _owner) {
+				// call the 'use' event
+				item->use();
+				return;
+			}
+
 			if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
 				debugC(kDebugObject, "Can't use: avatarInStasis");
 				return;
 			}
 
 			MainActor *avatar = getMainActor();
-			if (objID == _owner || avatar->canReach(item, 128)) { // CONSTANT!
+			if (avatar->canReach(item, 128)) { // CONSTANT!
 				// call the 'use' event
 				item->use();
 			} else {