[Scummvm-git-logs] scummvm master -> bf534c5628dc3af4b0d8ebfaa7d286445cdabd08
dreammaster
paulfgilbert at gmail.com
Wed May 6 02:54:32 UTC 2020
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:
7d2167774b ULTIMA4: Fix dungeon debugger command
bf534c5628 ULTIMA4: Other debugger fixes
Commit: 7d2167774bfad801a8f9c19e450ff0abb770bde1
https://github.com/scummvm/scummvm/commit/7d2167774bfad801a8f9c19e450ff0abb770bde1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-05T19:40:22-07:00
Commit Message:
ULTIMA4: Fix dungeon debugger command
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 eb51c3e034..0b784c71cd 100644
--- a/engines/ultima/ultima4/core/debugger.cpp
+++ b/engines/ultima/ultima4/core/debugger.cpp
@@ -1298,7 +1298,7 @@ bool Debugger::cmdDungeon(int argc, const char **argv) {
int dungNum = strToInt(argv[1]);
if (dungNum >= 1 && dungNum <= 8) {
- g_context->_location->_coords = g_context->_location->_map->_portals[dungNum - 1]->_coords;
+ g_context->_location->_coords = g_context->_location->_map->_portals[dungNum + 15]->_coords;
return false;
} else if (dungNum == 9) {
g_game->setMap(mapMgr->get(MAP_DECEIT), 1, nullptr);
Commit: bf534c5628dc3af4b0d8ebfaa7d286445cdabd08
https://github.com/scummvm/scummvm/commit/bf534c5628dc3af4b0d8ebfaa7d286445cdabd08
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-05T19:47:42-07:00
Commit Message:
ULTIMA4: Other debugger fixes
Changed paths:
engines/ultima/ultima4/core/debugger.cpp
engines/ultima/ultima4/core/debugger.h
engines/ultima/ultima4/meta_engine.cpp
diff --git a/engines/ultima/ultima4/core/debugger.cpp b/engines/ultima/ultima4/core/debugger.cpp
index 0b784c71cd..497a2867f2 100644
--- a/engines/ultima/ultima4/core/debugger.cpp
+++ b/engines/ultima/ultima4/core/debugger.cpp
@@ -57,13 +57,14 @@ Debugger::Debugger() : Shared::Debugger() {
registerCmd("move", WRAP_METHOD(Debugger, cmdMove));
registerCmd("attack", WRAP_METHOD(Debugger, cmdAttack));
registerCmd("board", WRAP_METHOD(Debugger, cmdBoard));
+ registerCmd("camp", WRAP_METHOD(Debugger, cmdCamp));
registerCmd("cast", WRAP_METHOD(Debugger, cmdCastSpell));
registerCmd("climb", WRAP_METHOD(Debugger, cmdClimb));
+ registerCmd("descend", WRAP_METHOD(Debugger, cmdDescend));
registerCmd("enter", WRAP_METHOD(Debugger, cmdEnter));
registerCmd("exit", WRAP_METHOD(Debugger, cmdExit));
registerCmd("fire", WRAP_METHOD(Debugger, cmdFire));
registerCmd("get", WRAP_METHOD(Debugger, cmdGetChest));
- registerCmd("hole", WRAP_METHOD(Debugger, cmdHoleUp));
registerCmd("ignite", WRAP_METHOD(Debugger, cmdIgnite));
registerCmd("interact", WRAP_METHOD(Debugger, cmdInteract));
registerCmd("jimmy", WRAP_METHOD(Debugger, cmdJimmy));
@@ -455,6 +456,26 @@ bool Debugger::cmdCastSpell(int argc, const char **argv) {
return isDebuggerActive();
}
+bool Debugger::cmdCamp(int argc, const char **argv) {
+ print("Hole up & Camp!");
+
+ if (!(g_context->_location->_context & (CTX_WORLDMAP | CTX_DUNGEON))) {
+ print("%cNot here!%c", FG_GREY, FG_WHITE);
+ return isDebuggerActive();
+ }
+
+ if (g_context->_transportContext != TRANSPORT_FOOT) {
+ print("%cOnly on foot!%c", FG_GREY, FG_WHITE);
+ return isDebuggerActive();
+ }
+
+ CombatController *cc = new CampController();
+ cc->init(nullptr);
+ cc->begin();
+
+ return isDebuggerActive();
+}
+
bool Debugger::cmdClimb(int argc, const char **argv) {
if (!usePortalAt(g_context->_location, g_context->_location->_coords, ACTION_KLIMB)) {
if (g_context->_transportContext == TRANSPORT_BALLOON) {
@@ -499,7 +520,7 @@ bool Debugger::cmdDescend(int argc, const char **argv) {
bool Debugger::cmdEnter(int argc, const char **argv) {
if (!usePortalAt(g_context->_location, g_context->_location->_coords, ACTION_ENTER)) {
if (!g_context->_location->_map->portalAt(g_context->_location->_coords, ACTION_ENTER))
- print("%cEnter what?%c\n", FG_GREY, FG_WHITE);
+ print("%cEnter what?%c", FG_GREY, FG_WHITE);
} else {
dontEndTurn();
}
@@ -616,26 +637,6 @@ bool Debugger::cmdGetChest(int argc, const char **argv) {
return isDebuggerActive();
}
-bool Debugger::cmdHoleUp(int argc, const char **argv) {
- print("Hole up & Camp!");
-
- if (!(g_context->_location->_context & (CTX_WORLDMAP | CTX_DUNGEON))) {
- print("%cNot here!%c", FG_GREY, FG_WHITE);
- return isDebuggerActive();
- }
-
- if (g_context->_transportContext != TRANSPORT_FOOT) {
- print("%cOnly on foot!%c", FG_GREY, FG_WHITE);
- return isDebuggerActive();
- }
-
- CombatController *cc = new CampController();
- cc->init(nullptr);
- cc->begin();
-
- return isDebuggerActive();
-}
-
bool Debugger::cmdIgnite(int argc, const char **argv) {
print("Ignite torch!");
if (g_context->_location->_context == CTX_DUNGEON) {
@@ -1212,7 +1213,7 @@ bool Debugger::cmdYell(int argc, const char **argv) {
bool Debugger::cmd3d(int argc, const char **argv) {
if (g_context->_location->_context == CTX_DUNGEON) {
- print("3-D view %s\n", DungeonViewer.toggle3DDungeonView() ? "on" : "off");
+ print("3-D view %s", DungeonViewer.toggle3DDungeonView() ? "on" : "off");
} else {
print("Not here");
}
@@ -1281,7 +1282,7 @@ bool Debugger::cmdDestroy(int argc, const char **argv) {
}
}
- print("%cNothing there!%c\n", FG_GREY, FG_WHITE);
+ print("%cNothing there!%c", FG_GREY, FG_WHITE);
return isDebuggerActive();
}
@@ -1333,7 +1334,7 @@ bool Debugger::cmdFlee(int argc, const char **argv) {
// End the combat without losing karma
g_combat->end(false);
} else {
- g_screen->screenMessage("Bad command\n");
+ print("Bad command");
}
return isDebuggerActive();
@@ -1464,7 +1465,7 @@ bool Debugger::cmdItems(int argc, const char **argv) {
}
bool Debugger::cmdKarma(int argc, const char **argv) {
- print("Karma!\n");
+ print("Karma!");
for (int i = 0; i < 8; ++i) {
Common::String line = Common::String::format("%s:",
@@ -1505,10 +1506,10 @@ bool Debugger::cmdLocation(int argc, const char **argv) {
g_context->_location->_map->getName().c_str(), pos.x, pos.y, pos.z);
} else {
if (g_context->_location->_map->isWorldMap())
- print("\nLocation:\n%s\nx: %d\ny: %d\n", "World Map",
+ print("\nLocation:\n%s\nx: %d\ny: %d", "World Map",
pos.x, pos.y);
else
- print("\nLocation:\n%s\nx: %d\ny: %d\nz: %d\n",
+ print("\nLocation:\n%s\nx: %d\ny: %d\nz: %d",
g_context->_location->_map->getName().c_str(), pos.x, pos.y, pos.z);
}
@@ -1593,7 +1594,7 @@ bool Debugger::cmdSummon(int argc, const char **argv) {
}
bool Debugger::cmdTorch(int argc, const char **argv) {
- print("Torch: %d\n", g_context->_party->getTorchDuration());
+ print("Torch: %d", g_context->_party->getTorchDuration());
if (!isDebuggerActive())
g_screen->screenPrompt();
diff --git a/engines/ultima/ultima4/core/debugger.h b/engines/ultima/ultima4/core/debugger.h
index 1f0b567a0e..36d61e9a78 100644
--- a/engines/ultima/ultima4/core/debugger.h
+++ b/engines/ultima/ultima4/core/debugger.h
@@ -134,9 +134,9 @@ private:
bool cmdGetChest(int argc, const char **argv);
/**
- * Hole Up
+ * Hole Up & Camp
*/
- bool cmdHoleUp(int argc, const char **argv);
+ bool cmdCamp(int argc, const char **argv);
/**
* Ignite Torch
diff --git a/engines/ultima/ultima4/meta_engine.cpp b/engines/ultima/ultima4/meta_engine.cpp
index 0801ff6ef4..a1871351fe 100644
--- a/engines/ultima/ultima4/meta_engine.cpp
+++ b/engines/ultima/ultima4/meta_engine.cpp
@@ -54,7 +54,7 @@ static const KeybindingRecord NORMAL_KEYS[] = {
{ KEYBIND_EXIT, "EXIT", "Exit", "exit", "x", nullptr },
{ KEYBIND_FIRE, "FIRE", "Fire", "fire", "f", nullptr },
{ KEYBIND_GET, "GET", "Get Chest", "get", "g", nullptr },
- { KEYBIND_HOLE_UP, "HOLE-UP", "Hole Up", "hole", "h", nullptr },
+ { KEYBIND_HOLE_UP, "HOLE-UP", "Hole Up & Camp", "camp", "h", nullptr },
{ KEYBIND_JIMMY, "JIMMY", "Jimmy", "jimmy", "j", nullptr },
{ KEYBIND_IGNITE, "IGNITE", "Ignite", "ignite", "i", nullptr },
{ KEYBIND_LOCATE, "LOCATE", "Locate Position", "locate", "l", nullptr },
More information about the Scummvm-git-logs
mailing list