[Scummvm-git-logs] scummvm master -> 75b8da08aa6675336e5a472bf20e5316e6d742d1

[mduggan]

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:
75b8da08aa ULTIMA8: Reset crusader teleport flag on item selection


Commit: 75b8da08aa6675336e5a472bf20e5316e6d742d1
    https://github.com/scummvm/scummvm/commit/75b8da08aa6675336e5a472bf20e5316e6d742d1
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2022-06-12T16:09:31+09:00

Commit Message:
ULTIMA8: Reset crusader teleport flag on item selection

The original game resets this flag when 'g' or 's' buttons are pressed.  I
assume this was a workaround in the original for the same problem we see in bug
13381.  Reproduce the hack from the original game.

Changed paths:
    engines/ultima/ultima8/misc/debugger.cpp


diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index 28c5dd20e30..57aa9b8a50d 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -1401,6 +1401,9 @@ bool Debugger::cmdStartSelection(int argc, const char **argv) {
 		return false;
 	}
 
+	// Clear this flag on selection to match original behavior.
+	Ultima8Engine::get_instance()->setCrusaderTeleporting(false);
+
 	ItemSelectionProcess *proc = ItemSelectionProcess::get_instance();
 	if (proc)
 		proc->selectNextItem(false);
@@ -1435,6 +1438,9 @@ bool Debugger::cmdGrabItems(int argc, const char **argv) {
 		return false;
 	}
 
+	// Clear this flag on selection to match original behavior.
+	Ultima8Engine::get_instance()->setCrusaderTeleporting(false);
+
 	ItemSelectionProcess *proc = ItemSelectionProcess::get_instance();
 	if (proc)
 		proc->selectNextItem(true);