libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PEGASUS: Add default joystick action bindings

Browse Source
This commit is contained in:
Bastien Bouclet 2020-01-26 16:34:51 +01:00
parent 32174c9067
commit 376a77e735
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/pegasus/input.cpp
View File

@ -95,13 +95,6 @@ void InputDeviceManager::getInput(Input &input, const InputBits filter) {
if (_keysDown[kPegasusActionShowBiochip])
currentBits |= (kRawButtonDown << kRightFireButtonShift);
// Update mouse button state
// Note that we don't use EVENT_LBUTTONUP/EVENT_LBUTTONDOWN because
// they do not show if the button is being held down. We're treating
// both mouse buttons as the same for ease of use.
if (g_system->getEventManager()->getButtonState() != 0)
currentBits |= (kRawButtonDown << kTwoButtonShift);
// Update the mouse position too
input.setInputLocation(g_system->getEventManager()->getMousePos());

13
engines/pegasus/pegasus.cpp
View File

@ -2500,24 +2500,28 @@ Common::Keymap *PegasusEngine::initKeymap() {
act->setCustomEngineActionEvent(kPegasusActionUp);
act->addDefaultInputMapping("UP");
act->addDefaultInputMapping("KP8");
act->addDefaultInputMapping("JOY_UP");
engineKeyMap->addAction(act);
act = new Action(kStandardActionMoveBackwards, _("Down/Zoom Out"));
act->setCustomEngineActionEvent(kPegasusActionDown);
act->addDefaultInputMapping("DOWN");
act->addDefaultInputMapping("KP5");
act->addDefaultInputMapping("JOY_DOWN");
engineKeyMap->addAction(act);
act = new Action(kStandardActionTurnLeft, _("Turn Left"));
act->setCustomEngineActionEvent(kPegasusActionLeft);
act->addDefaultInputMapping("LEFT");
act->addDefaultInputMapping("KP4");
act->addDefaultInputMapping("JOY_LEFT");
engineKeyMap->addAction(act);
act = new Action(kStandardActionTurnRight, _("Turn Right"));
act->setCustomEngineActionEvent(kPegasusActionRight);
act->addDefaultInputMapping("RIGHT");
act->addDefaultInputMapping("KP6");
act->addDefaultInputMapping("JOY_RIGHT");
engineKeyMap->addAction(act);
act = new Action("ENT", _("Action/Select"));
@ -2525,6 +2529,10 @@ Common::Keymap *PegasusEngine::initKeymap() {
act->addDefaultInputMapping("SPACE");
act->addDefaultInputMapping("RETURN");
act->addDefaultInputMapping("KP_ENTER");
act->addDefaultInputMapping("JOY_A");
// We're treating both mouse buttons as the same for ease of use.
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("MOUSE_RIGHT");
engineKeyMap->addAction(act);
// The original also used clear (aka "num lock" on Mac keyboards) here, but it doesn't
@ -2540,6 +2548,7 @@ Common::Keymap *PegasusEngine::initKeymap() {
act->setCustomEngineActionEvent(kPegasusActionShowInventory);
act->addDefaultInputMapping("BACKQUOTE");
act->addDefaultInputMapping("KP7");
act->addDefaultInputMapping("JOY_LEFT_SHOULDER");
engineKeyMap->addAction(act);
act = new Action("TBI", _("Display/Hide Biochip Tray"));
@ -2547,24 +2556,28 @@ Common::Keymap *PegasusEngine::initKeymap() {
act->addDefaultInputMapping("BACKSPACE");
act->addDefaultInputMapping("KP9");
act->addDefaultInputMapping("KP_MULTIPLY");
act->addDefaultInputMapping("JOY_RIGHT_SHOULDER");
engineKeyMap->addAction(act);
act = new Action("TMA", _("Toggle Center Data Display"));
act->setCustomEngineActionEvent(kPegasusActionToggleCenterDisplay);
act->addDefaultInputMapping("t");
act->addDefaultInputMapping("KP_EQUALS");
act->addDefaultInputMapping("JOY_Y");
engineKeyMap->addAction(act);
act = new Action("TIN", _("Display/Hide Info Screen"));
act->setCustomEngineActionEvent(kPegasusActionShowInfoScreen);
act->addDefaultInputMapping("i");
act->addDefaultInputMapping("KP_DIVIDE");
act->addDefaultInputMapping("JOY_X");
engineKeyMap->addAction(act);
act = new Action("PM", _("Display/Hide Pause Menu"));
act->setCustomEngineActionEvent(kPegasusActionShowPauseMenu);
act->addDefaultInputMapping("p");
act->addDefaultInputMapping("ESCAPE");
act->addDefaultInputMapping("JOY_BACK");
engineKeyMap->addAction(act);
// TODO: Add back Alt to the default mappings