[Scummvm-git-logs] scummvm master -> 78084e8b963950718f46253744b38079e9ef4c74

[dreammaster]

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

Summary:
873c8bdbea ULTIMA4: Fix name clash for the help debugger command
78084e8b96 ULTIMA4: Allow using items in combat


Commit: 873c8bdbeaf5264bc37983b5119f00a247e26f47
    https://github.com/scummvm/scummvm/commit/873c8bdbeaf5264bc37983b5119f00a247e26f47
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-27T20:02:18-07:00

Commit Message:
ULTIMA4: Fix name clash for the help debugger command

Changed paths:
    engines/ultima/ultima4/core/debugger.cpp
    engines/ultima/ultima4/core/debugger.h


diff --git a/engines/ultima/ultima4/core/debugger.cpp b/engines/ultima/ultima4/core/debugger.cpp
index c716bb04a7..c3713b8eec 100644
--- a/engines/ultima/ultima4/core/debugger.cpp
+++ b/engines/ultima/ultima4/core/debugger.cpp
@@ -101,11 +101,11 @@ Debugger::Debugger() : Shared::Debugger() {
 	registerCmd("fullstats", WRAP_METHOD(Debugger, cmdFullStats));
 	registerCmd("gate", WRAP_METHOD(Debugger, cmdGate));
 	registerCmd("goto", WRAP_METHOD(Debugger, cmdGoto));
-	registerCmd("help", WRAP_METHOD(Debugger, cmdHelp));
 	registerCmd("items", WRAP_METHOD(Debugger, cmdItems));
 	registerCmd("karma", WRAP_METHOD(Debugger, cmdKarma));
 	registerCmd("leave", WRAP_METHOD(Debugger, cmdLeave));
 	registerCmd("location", WRAP_METHOD(Debugger, cmdLocation));
+	registerCmd("lordbritish", WRAP_METHOD(Debugger, cmdLorddBritish));
 	registerCmd("mixtures", WRAP_METHOD(Debugger, cmdMixtures));
 	registerCmd("moon", WRAP_METHOD(Debugger, cmdMoon));
 	registerCmd("opacity", WRAP_METHOD(Debugger, cmdOpacity));
@@ -1456,9 +1456,9 @@ bool Debugger::cmdGoto(int argc, const char **argv) {
 	}
 }
 
-bool Debugger::cmdHelp(int argc, const char **argv) {
+bool Debugger::cmdLorddBritish(int argc, const char **argv) {
 	if (!isDebuggerActive()) {
-		print("Help!");
+		print("Help me LB!");
 		g_screen->screenPrompt();
 	}
 
diff --git a/engines/ultima/ultima4/core/debugger.h b/engines/ultima/ultima4/core/debugger.h
index 9fbe31ebe9..7a0549c671 100644
--- a/engines/ultima/ultima4/core/debugger.h
+++ b/engines/ultima/ultima4/core/debugger.h
@@ -304,7 +304,7 @@ private:
 	/**
 	 * Help.. sends the party to Lord British
 	 */
-	bool cmdHelp(int argc, const char **argv);
+	bool cmdLorddBritish(int argc, const char **argv);
 
 	/**
 	 * Grant karma


Commit: 78084e8b963950718f46253744b38079e9ef4c74
    https://github.com/scummvm/scummvm/commit/78084e8b963950718f46253744b38079e9ef4c74
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-27T21:42:04-07:00

Commit Message:
ULTIMA4: Allow using items in combat

Changed paths:
    engines/ultima/ultima4/core/debugger.cpp


diff --git a/engines/ultima/ultima4/core/debugger.cpp b/engines/ultima/ultima4/core/debugger.cpp
index c3713b8eec..20b2a5b37c 100644
--- a/engines/ultima/ultima4/core/debugger.cpp
+++ b/engines/ultima/ultima4/core/debugger.cpp
@@ -170,7 +170,7 @@ bool Debugger::handleCommand(int argc, const char **argv, bool &keepRunning) {
 	static const char *COMBAT_DISALLOWED[] = {
 		"board", "climb", "descend", "enter", "exit", "fire", "hole",
 		"ignite", "jimmy", "mix", "order", "open", "peer", "quitAndSave",
-		"search", "use", "wear", "yell", nullptr
+		"search", "wear", "yell", nullptr
 	};
 
 	if (g_context && g_context->_location) {