[Scummvm-git-logs] scummvm master -> e069f25e3a8b61efabaf64bd9e2dcd96db65630d
bgK
bastien.bouclet at gmail.com
Sun Feb 16 14:39:35 UTC 2020
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
60ab1dc239 MOHAWK: Remove the debugger keymapper action
06e6176285 PEGASUS: Remove the debugger keymapper action
e069f25e3a KEYMAPPER: Remove the debugger standard action
Commit: 60ab1dc239b3df590cd98e3c08b41378abded1e0
https://github.com/scummvm/scummvm/commit/60ab1dc239b3df590cd98e3c08b41378abded1e0
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-16T15:35:30+01:00
Commit Message:
MOHAWK: Remove the debugger keymapper action
Opening the debugger is now in the global keymap.
Changed paths:
engines/mohawk/myst.cpp
engines/mohawk/riven.cpp
engines/mohawk/riven_actions.h
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 92c4c78..6046e28 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -70,8 +70,7 @@ enum MystEventAction {
kMystActionLoadGameState,
kMystActionSaveGameState,
kMystActionOpenOptionsDialog,
- kMystActionPause,
- kMystActionOpenDebugger
+ kMystActionPause
};
MohawkEngine_Myst::MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription *gamedesc) :
@@ -549,11 +548,6 @@ Common::KeymapArray MohawkEngine_Myst::initKeymaps(const char *target) {
act->addDefaultInputMapping("SPACE");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionOpenDebugger, _("Open debugger"));
- act->setCustomEngineActionEvent(kMystActionOpenDebugger);
- act->addDefaultInputMapping("C+d");
- engineKeyMap->addAction(act);
-
return Keymap::arrayOf(engineKeyMap);
}
@@ -578,9 +572,6 @@ void MohawkEngine_Myst::doFrame() {
break;
case Common::EVENT_CUSTOM_ENGINE_ACTION_START:
switch ((MystEventAction)event.customType) {
- case kMystActionOpenDebugger:
- getDebugger()->attach();
- break;
case kMystActionInteract:
_mouseClicked = true;
break;
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index faa40c6..f3480a0 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -267,9 +267,6 @@ void MohawkEngine_Riven::processInput() {
case kRivenActionInteract:
_stack->onMouseDown(_eventMan->getMousePos());
break;
- case kRivenActionOpenDebugger:
- getDebugger()->attach();
- break;
case kRivenActionPause:
pauseGame();
break;
@@ -947,11 +944,6 @@ Common::KeymapArray MohawkEngine_Riven::initKeymaps(const char *target) {
act->addDefaultInputMapping("PAGEDOWN");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionOpenDebugger, _("Open debugger"));
- act->setCustomEngineActionEvent(kRivenActionOpenDebugger);
- act->addDefaultInputMapping("C+d");
- engineKeyMap->addAction(act);
-
if (checkGameGUIOption(GAMEOPTION_DEMO, ConfMan.get("guioptions", target))) {
act = new Action(kStandardActionOpenMainMenu, _("Return to main menu"));
act->setCustomEngineActionEvent(kRivenActionOpenMainMenu);
diff --git a/engines/mohawk/riven_actions.h b/engines/mohawk/riven_actions.h
index bc29d87..3cccdb6 100644
--- a/engines/mohawk/riven_actions.h
+++ b/engines/mohawk/riven_actions.h
@@ -43,8 +43,7 @@ enum RivenAction {
kRivenActionPlayIntroVideos,
kRivenActionLoadGameState,
kRivenActionSaveGameState,
- kRivenActionOpenOptionsDialog,
- kRivenActionOpenDebugger
+ kRivenActionOpenOptionsDialog
};
} // End of namespace Mohawk
Commit: 06e61762856bbe2f56f274dd18ea9eb7b581529c
https://github.com/scummvm/scummvm/commit/06e61762856bbe2f56f274dd18ea9eb7b581529c
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-16T15:35:31+01:00
Commit Message:
PEGASUS: Remove the debugger keymapper action
Opening the debugger is now in the global keymap.
Changed paths:
engines/pegasus/input.cpp
engines/pegasus/input.h
engines/pegasus/pegasus.cpp
diff --git a/engines/pegasus/input.cpp b/engines/pegasus/input.cpp
index a6053df..c9689ad 100644
--- a/engines/pegasus/input.cpp
+++ b/engines/pegasus/input.cpp
@@ -46,7 +46,6 @@ InputDeviceManager::InputDeviceManager() {
g_system->getEventManager()->getEventDispatcher()->registerObserver(this, 2, false);
_lastRawBits = kAllUpBits;
- _consoleRequested = false;
}
InputDeviceManager::~InputDeviceManager() {
@@ -138,9 +137,6 @@ bool InputDeviceManager::notifyEvent(const Common::Event &event) {
switch (event.type) {
case Common::EVENT_CUSTOM_ENGINE_ACTION_START:
switch ((PegasusAction)event.customType) {
- case kPegasusActionOpenDebugger:
- _consoleRequested = true;
- break;
case kPegasusActionSaveGameState:
((PegasusEngine *)g_engine)->requestSave();
break;
diff --git a/engines/pegasus/input.h b/engines/pegasus/input.h
index a42ebc3..68f9404 100644
--- a/engines/pegasus/input.h
+++ b/engines/pegasus/input.h
@@ -52,7 +52,6 @@ enum PegasusAction {
kPegasusActionShowPauseMenu,
kPegasusActionSaveGameState,
kPegasusActionLoadGameState,
- kPegasusActionOpenDebugger,
kPegasusActionEnableEasterEgg,
kPegasusActionCount
@@ -77,7 +76,6 @@ protected:
// Keep track of which keys are down (= true) or not
bool _keysDown[kPegasusActionCount];
InputBits _lastRawBits;
- bool _consoleRequested;
};
enum {
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index 1e17792..599985c 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -2577,11 +2577,6 @@ Common::KeymapArray PegasusEngine::initKeymaps() {
act->addDefaultInputMapping("e");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionOpenDebugger, _("Open debugger"));
- act->setCustomEngineActionEvent(kPegasusActionOpenDebugger);
- act->addDefaultInputMapping("C+d");
- engineKeyMap->addAction(act);
-
// We support meta where available and control elsewhere
act = new Action(kStandardActionSave, _("Save Game"));
act->setCustomEngineActionEvent(kPegasusActionSaveGameState);
Commit: e069f25e3a8b61efabaf64bd9e2dcd96db65630d
https://github.com/scummvm/scummvm/commit/e069f25e3a8b61efabaf64bd9e2dcd96db65630d
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-16T15:35:46+01:00
Commit Message:
KEYMAPPER: Remove the debugger standard action
It is no longer used
Changed paths:
backends/keymapper/standard-actions.cpp
backends/keymapper/standard-actions.h
diff --git a/backends/keymapper/standard-actions.cpp b/backends/keymapper/standard-actions.cpp
index 31a1d99..a0ed94e 100644
--- a/backends/keymapper/standard-actions.cpp
+++ b/backends/keymapper/standard-actions.cpp
@@ -35,6 +35,5 @@ const char *kStandardActionOpenMainMenu = "MENU";
const char *kStandardActionLoad = "LOAD";
const char *kStandardActionSave = "SAVE";
const char *kStandardActionOpenSettings = "OPTS";
-const char *kStandardActionOpenDebugger = "DBG";
} //namespace Common
diff --git a/backends/keymapper/standard-actions.h b/backends/keymapper/standard-actions.h
index 7f46361..dc2a588 100644
--- a/backends/keymapper/standard-actions.h
+++ b/backends/keymapper/standard-actions.h
@@ -47,7 +47,6 @@ extern const char *kStandardActionOpenMainMenu;
extern const char *kStandardActionLoad;
extern const char *kStandardActionSave;
extern const char *kStandardActionOpenSettings;
-extern const char *kStandardActionOpenDebugger;
} //namespace Common
More information about the Scummvm-git-logs
mailing list