[Scummvm-git-logs] scummvm master -> 8e7c405f174bbce5352bb7a13ba9712272ed75a3

[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:
8e7c405f17 ULTIMA8: fix #13875 - do not allow middle-click pathfinding while in stasis


Commit: 8e7c405f174bbce5352bb7a13ba9712272ed75a3
    https://github.com/scummvm/scummvm/commit/8e7c405f174bbce5352bb7a13ba9712272ed75a3
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-01-08T11:56:15-06:00

Commit Message:
ULTIMA8: fix #13875 - do not allow middle-click pathfinding while in stasis

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


diff --git a/engines/ultima/ultima8/gumps/game_map_gump.cpp b/engines/ultima/ultima8/gumps/game_map_gump.cpp
index 100b9b33cdf..643f65841ed 100644
--- a/engines/ultima/ultima8/gumps/game_map_gump.cpp
+++ b/engines/ultima/ultima8/gumps/game_map_gump.cpp
@@ -322,33 +322,13 @@ void GameMapGump::onMouseClick(int button, int32 mx, int32 my) {
 			item->getLocation(xv, yv, zv);
 			debugC(kDebugObject, "%s", item->dumpInfo().c_str());
 
-#if 1
-			Actor *avatarControlled = getControlledActor();
-			PathfinderProcess *pfp = new PathfinderProcess(avatarControlled, xv, yv, zv);
-			Kernel::get_instance()->addProcess(pfp);
-#elif 0
-			if (dynamic_cast<Actor *>(item)) {
-				dynamic_cast<Actor *>(item)->die(0);
+			if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
+				debugC(kDebugObject, "Can't move: avatarInStasis");
 			} else {
-				item->destroy();
-			}
-#elif 0
-			UCList uclist(2);
-			LOOPSCRIPT(script, LS_TOKEN_TRUE); // we want all items
-			World *world = World::get_instance();
-			world->getCurrentMap()->surfaceSearch(&uclist, script,
-			                                      sizeof(script),
-			                                      item, true, false, true);
-			for (uint32 i = 0; i < uclist.getSize(); i++) {
-				Item *item2 = getItem(uclist.getuint16(i));
-				if (!item2) continue;
-				item2->setExtFlag(Item::EXT_HIGHLIGHT);
+				Actor *avatarControlled = getControlledActor();
+				PathfinderProcess *pfp = new PathfinderProcess(avatarControlled, xv, yv, zv);
+				Kernel::get_instance()->addProcess(pfp);
 			}
-#elif 0
-			item->receiveHit(1, 0, 1024, 0);
-#elif 0
-			item->clearFlag(Item::FLG_HANGING);
-#endif
 		}
 	}
 	default: