mirror of
https://github.com/scummvm/scummvm.git
synced 2026-11-18 21:34:48 +00:00
ULTIMA6: Fix loading of key bindings
This commit is contained in:
1 parent
10e1950e35
commit
8ca993dd9e
3 files changed
+67
-68
No files matched your search
@@ -32,6 +32,71 @@ enum MouseButton { BUTTON_NONE = 0, BUTTON_LEFT = 1, BUTTON_RIGHT = 2, BUTTON_MI
|
||||
|
||||
#define BUTTON_MASK(MB) (1 << ((int)(MB) - 1))
|
||||
|
||||
/**
|
||||
* Joystick actions mapped to dummy unused keycode values
|
||||
*/
|
||||
const Common::KeyCode FIRST_JOY = (Common::KeyCode)400;
|
||||
const Common::KeyCode JOY_UP = FIRST_JOY; // PS d-pad when analog is disabled. left stick when enabled
|
||||
const Common::KeyCode JOY_DOWN = (Common::KeyCode)(FIRST_JOY + 1);
|
||||
const Common::KeyCode JOY_LEFT = (Common::KeyCode)(FIRST_JOY + 2);
|
||||
const Common::KeyCode JOY_RIGHT = (Common::KeyCode)(FIRST_JOY + 3);
|
||||
const Common::KeyCode JOY_RIGHTUP = (Common::KeyCode)(FIRST_JOY + 4);
|
||||
const Common::KeyCode JOY_RIGHTDOWN = (Common::KeyCode)(FIRST_JOY + 5);
|
||||
const Common::KeyCode JOY_LEFTUP = (Common::KeyCode)(FIRST_JOY + 6);
|
||||
const Common::KeyCode JOY_LEFTDOWN = (Common::KeyCode)(FIRST_JOY + 7);
|
||||
const Common::KeyCode JOY_UP2 = (Common::KeyCode)(FIRST_JOY + 8); // PS right stick when analog is enabled
|
||||
const Common::KeyCode JOY_DOWN2 = (Common::KeyCode)(FIRST_JOY + 9);
|
||||
const Common::KeyCode JOY_LEFT2 = (Common::KeyCode)(FIRST_JOY + 10);
|
||||
const Common::KeyCode JOY_RIGHT2 = (Common::KeyCode)(FIRST_JOY + 11);
|
||||
const Common::KeyCode JOY_RIGHTUP2 = (Common::KeyCode)(FIRST_JOY + 12);
|
||||
const Common::KeyCode JOY_RIGHTDOWN2 = (Common::KeyCode)(FIRST_JOY + 13);
|
||||
const Common::KeyCode JOY_LEFTUP2 = (Common::KeyCode)(FIRST_JOY + 14);
|
||||
const Common::KeyCode JOY_LEFTDOWN2 = (Common::KeyCode)(FIRST_JOY + 15);
|
||||
const Common::KeyCode JOY_UP3 = (Common::KeyCode)(FIRST_JOY + 16);
|
||||
const Common::KeyCode JOY_DOWN3 = (Common::KeyCode)(FIRST_JOY + 17);
|
||||
const Common::KeyCode JOY_LEFT3 = (Common::KeyCode)(FIRST_JOY + 18);
|
||||
const Common::KeyCode JOY_RIGHT3 = (Common::KeyCode)(FIRST_JOY + 19);
|
||||
const Common::KeyCode JOY_RIGHTUP3 = (Common::KeyCode)(FIRST_JOY + 20);
|
||||
const Common::KeyCode JOY_RIGHTDOWN3 = (Common::KeyCode)(FIRST_JOY + 21);
|
||||
const Common::KeyCode JOY_LEFTUP3 = (Common::KeyCode)(FIRST_JOY + 22);
|
||||
const Common::KeyCode JOY_LEFTDOWN3 = (Common::KeyCode)(FIRST_JOY + 23);
|
||||
const Common::KeyCode JOY_UP4 = (Common::KeyCode)(FIRST_JOY + 24);
|
||||
const Common::KeyCode JOY_DOWN4 = (Common::KeyCode)(FIRST_JOY + 25);
|
||||
const Common::KeyCode JOY_LEFT4 = (Common::KeyCode)(FIRST_JOY + 26);
|
||||
const Common::KeyCode JOY_RIGHT4 = (Common::KeyCode)(FIRST_JOY + 27);
|
||||
const Common::KeyCode JOY_RIGHTUP4 = (Common::KeyCode)(FIRST_JOY + 28);
|
||||
const Common::KeyCode JOY_RIGHTDOWN4 = (Common::KeyCode)(FIRST_JOY + 29);
|
||||
const Common::KeyCode JOY_LEFTUP4 = (Common::KeyCode)(FIRST_JOY + 30);
|
||||
const Common::KeyCode JOY_LEFTDOWN4 = (Common::KeyCode)(FIRST_JOY + 31);
|
||||
const Common::KeyCode JOY_HAT_UP = (Common::KeyCode)(FIRST_JOY + 32); // PS d-pad when analog is enabled
|
||||
const Common::KeyCode JOY_HAT_DOWN = (Common::KeyCode)(FIRST_JOY + 33);
|
||||
const Common::KeyCode JOY_HAT_LEFT = (Common::KeyCode)(FIRST_JOY + 34);
|
||||
const Common::KeyCode JOY_HAT_RIGHT = (Common::KeyCode)(FIRST_JOY + 35);
|
||||
const Common::KeyCode JOY_HAT_RIGHTUP = (Common::KeyCode)(FIRST_JOY + 36);
|
||||
const Common::KeyCode JOY_HAT_RIGHTDOWN = (Common::KeyCode)(FIRST_JOY + 37);
|
||||
const Common::KeyCode JOY_HAT_LEFTUP = (Common::KeyCode)(FIRST_JOY + 38);
|
||||
const Common::KeyCode JOY_HAT_LEFTDOWN = (Common::KeyCode)(FIRST_JOY + 39);
|
||||
const Common::KeyCode JOY0 = (Common::KeyCode)(FIRST_JOY + 40); // PS triangle
|
||||
const Common::KeyCode JOY1 = (Common::KeyCode)(FIRST_JOY + 41); // PS circle
|
||||
const Common::KeyCode JOY2 = (Common::KeyCode)(FIRST_JOY + 42); // PS x
|
||||
const Common::KeyCode JOY3 = (Common::KeyCode)(FIRST_JOY + 43); // PS square
|
||||
const Common::KeyCode JOY4 = (Common::KeyCode)(FIRST_JOY + 44); // PS L2
|
||||
const Common::KeyCode JOY5 = (Common::KeyCode)(FIRST_JOY + 45); // PS R2
|
||||
const Common::KeyCode JOY6 = (Common::KeyCode)(FIRST_JOY + 46); // PS L1
|
||||
const Common::KeyCode JOY7 = (Common::KeyCode)(FIRST_JOY + 47); // PS R1
|
||||
const Common::KeyCode JOY8 = (Common::KeyCode)(FIRST_JOY + 48); // PS select
|
||||
const Common::KeyCode JOY9 = (Common::KeyCode)(FIRST_JOY + 49); // PS start
|
||||
const Common::KeyCode JOY10 = (Common::KeyCode)(FIRST_JOY + 50); // PS L3 (analog must be enabled)
|
||||
const Common::KeyCode JOY11 = (Common::KeyCode)(FIRST_JOY + 51); // PS R3 (analog must be enabled)
|
||||
const Common::KeyCode JOY12 = (Common::KeyCode)(FIRST_JOY + 52);
|
||||
const Common::KeyCode JOY13 = (Common::KeyCode)(FIRST_JOY + 53);
|
||||
const Common::KeyCode JOY14 = (Common::KeyCode)(FIRST_JOY + 54);
|
||||
const Common::KeyCode JOY15 = (Common::KeyCode)(FIRST_JOY + 55);
|
||||
const Common::KeyCode JOY16 = (Common::KeyCode)(FIRST_JOY + 56);
|
||||
const Common::KeyCode JOY17 = (Common::KeyCode)(FIRST_JOY + 57);
|
||||
const Common::KeyCode JOY18 = (Common::KeyCode)(FIRST_JOY + 58);
|
||||
const Common::KeyCode JOY19 = (Common::KeyCode)(FIRST_JOY + 59);
|
||||
|
||||
/**
|
||||
* Main system events manager
|
||||
*/
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include "ultima/ultima6/keybinding/keys.h"
|
||||
#include "ultima/ultima6/keybinding/key_actions.h"
|
||||
#include "ultima/ultima6/core/nuvie_defs.h"
|
||||
#include "ultima/ultima6/core/events.h"
|
||||
#include "ultima/ultima6/core/game.h"
|
||||
#include "ultima/ultima6/conf/xml_tree.h"
|
||||
#include "ultima/ultima6/core/player.h"
|
||||
@@ -195,8 +196,7 @@ const KeycodeString StringTable[] = {
|
||||
{"F13", Common::KEYCODE_F13},
|
||||
{"F14", Common::KEYCODE_F14},
|
||||
{"F15", Common::KEYCODE_F15},
|
||||
#ifdef HAVE_JOYSTICK_SUPPORT
|
||||
// hackishly map joystick buttons to unused keyboard syms
|
||||
// hackishly map joystick to unused keycode values
|
||||
{"JOY_UP", JOY_UP},
|
||||
{"JOY_DOWN", JOY_DOWN},
|
||||
{"JOY_LEFT", JOY_LEFT},
|
||||
@@ -257,7 +257,6 @@ const KeycodeString StringTable[] = {
|
||||
{"JOY17", JOY17},
|
||||
{"JOY18", JOY18},
|
||||
{"JOY19", JOY19},
|
||||
#endif /* HAVE_JOYSTICK_SUPPORT */
|
||||
{"", Common::KEYCODE_INVALID} // terminator
|
||||
};
|
||||
|
||||
|
||||
@@ -168,71 +168,6 @@ private:
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef HAVE_JOYSTICK_SUPPORT
|
||||
|
||||
static const Common::KeyCode FIRST_JOY = (Common::KeyCode)400;
|
||||
const Common::KeyCode JOY_UP = FIRST_JOY; // PS d-pad when analog is disabled. left stick when enabled
|
||||
const Common::KeyCode JOY_DOWN = (Common::KeyCode)(FIRST_JOY + 1);
|
||||
const Common::KeyCode JOY_LEFT = (Common::KeyCode)(FIRST_JOY + 2);
|
||||
const Common::KeyCode JOY_RIGHT = (Common::KeyCode)(FIRST_JOY + 3);
|
||||
const Common::KeyCode JOY_RIGHTUP = (Common::KeyCode)(FIRST_JOY + 4);
|
||||
const Common::KeyCode JOY_RIGHTDOWN = (Common::KeyCode)(FIRST_JOY + 5);
|
||||
const Common::KeyCode JOY_LEFTUP = (Common::KeyCode)(FIRST_JOY + 6);
|
||||
const Common::KeyCode JOY_LEFTDOWN = (Common::KeyCode)(FIRST_JOY + 7);
|
||||
const Common::KeyCode JOY_UP2 = (Common::KeyCode)(FIRST_JOY + 8); // PS right stick when analog is enabled
|
||||
const Common::KeyCode JOY_DOWN2 = (Common::KeyCode)(FIRST_JOY + 9);
|
||||
const Common::KeyCode JOY_LEFT2 = (Common::KeyCode)(FIRST_JOY + 10);
|
||||
const Common::KeyCode JOY_RIGHT2 = (Common::KeyCode)(FIRST_JOY + 11);
|
||||
const Common::KeyCode JOY_RIGHTUP2 = (Common::KeyCode)(FIRST_JOY + 12);
|
||||
const Common::KeyCode JOY_RIGHTDOWN2 = (Common::KeyCode)(FIRST_JOY + 13);
|
||||
const Common::KeyCode JOY_LEFTUP2 = (Common::KeyCode)(FIRST_JOY + 14);
|
||||
const Common::KeyCode JOY_LEFTDOWN2 = (Common::KeyCode)(FIRST_JOY + 15);
|
||||
const Common::KeyCode JOY_UP3 = (Common::KeyCode)(FIRST_JOY + 16);
|
||||
const Common::KeyCode JOY_DOWN3 = (Common::KeyCode)(FIRST_JOY + 17);
|
||||
const Common::KeyCode JOY_LEFT3 = (Common::KeyCode)(FIRST_JOY + 18);
|
||||
const Common::KeyCode JOY_RIGHT3 = (Common::KeyCode)(FIRST_JOY + 19);
|
||||
const Common::KeyCode JOY_RIGHTUP3 = (Common::KeyCode)(FIRST_JOY + 20);
|
||||
const Common::KeyCode JOY_RIGHTDOWN3 = (Common::KeyCode)(FIRST_JOY + 21);
|
||||
const Common::KeyCode JOY_LEFTUP3 = (Common::KeyCode)(FIRST_JOY + 22);
|
||||
const Common::KeyCode JOY_LEFTDOWN3 = (Common::KeyCode)(FIRST_JOY + 23);
|
||||
const Common::KeyCode JOY_UP4 = (Common::KeyCode)(FIRST_JOY + 24);
|
||||
const Common::KeyCode JOY_DOWN4 = (Common::KeyCode)(FIRST_JOY + 25);
|
||||
const Common::KeyCode JOY_LEFT4 = (Common::KeyCode)(FIRST_JOY + 26);
|
||||
const Common::KeyCode JOY_RIGHT4 = (Common::KeyCode)(FIRST_JOY + 27);
|
||||
const Common::KeyCode JOY_RIGHTUP4 = (Common::KeyCode)(FIRST_JOY + 28);
|
||||
const Common::KeyCode JOY_RIGHTDOWN4 = (Common::KeyCode)(FIRST_JOY + 29);
|
||||
const Common::KeyCode JOY_LEFTUP4 = (Common::KeyCode)(FIRST_JOY + 30);
|
||||
const Common::KeyCode JOY_LEFTDOWN4 = (Common::KeyCode)(FIRST_JOY + 31);
|
||||
const Common::KeyCode JOY_HAT_UP = (Common::KeyCode)(FIRST_JOY + 32); // PS d-pad when analog is enabled
|
||||
const Common::KeyCode JOY_HAT_DOWN = (Common::KeyCode)(FIRST_JOY + 33);
|
||||
const Common::KeyCode JOY_HAT_LEFT = (Common::KeyCode)(FIRST_JOY + 34);
|
||||
const Common::KeyCode JOY_HAT_RIGHT = (Common::KeyCode)(FIRST_JOY + 35);
|
||||
const Common::KeyCode JOY_HAT_RIGHTUP = (Common::KeyCode)(FIRST_JOY + 36);
|
||||
const Common::KeyCode JOY_HAT_RIGHTDOWN = (Common::KeyCode)(FIRST_JOY + 37);
|
||||
const Common::KeyCode JOY_HAT_LEFTUP = (Common::KeyCode)(FIRST_JOY + 38);
|
||||
const Common::KeyCode JOY_HAT_LEFTDOWN = (Common::KeyCode)(FIRST_JOY + 39);
|
||||
const Common::KeyCode JOY0 = (Common::KeyCode)(FIRST_JOY + 40); // PS triangle
|
||||
const Common::KeyCode JOY1 = (Common::KeyCode)(FIRST_JOY + 41); // PS circle
|
||||
const Common::KeyCode JOY2 = (Common::KeyCode)(FIRST_JOY + 42); // PS x
|
||||
const Common::KeyCode JOY3 = (Common::KeyCode)(FIRST_JOY + 43); // PS square
|
||||
const Common::KeyCode JOY4 = (Common::KeyCode)(FIRST_JOY + 44); // PS L2
|
||||
const Common::KeyCode JOY5 = (Common::KeyCode)(FIRST_JOY + 45); // PS R2
|
||||
const Common::KeyCode JOY6 = (Common::KeyCode)(FIRST_JOY + 46); // PS L1
|
||||
const Common::KeyCode JOY7 = (Common::KeyCode)(FIRST_JOY + 47); // PS R1
|
||||
const Common::KeyCode JOY8 = (Common::KeyCode)(FIRST_JOY + 48); // PS select
|
||||
const Common::KeyCode JOY9 = (Common::KeyCode)(FIRST_JOY + 49); // PS start
|
||||
const Common::KeyCode JOY10 = (Common::KeyCode)(FIRST_JOY + 50); // PS L3 (analog must be enabled)
|
||||
const Common::KeyCode JOY11 = (Common::KeyCode)(FIRST_JOY + 51); // PS R3 (analog must be enabled)
|
||||
const Common::KeyCode JOY12 = (Common::KeyCode)(FIRST_JOY + 52);
|
||||
const Common::KeyCode JOY13 = (Common::KeyCode)(FIRST_JOY + 53);
|
||||
const Common::KeyCode JOY14 = (Common::KeyCode)(FIRST_JOY + 54);
|
||||
const Common::KeyCode JOY15 = (Common::KeyCode)(FIRST_JOY + 55);
|
||||
const Common::KeyCode JOY16 = (Common::KeyCode)(FIRST_JOY + 56);
|
||||
const Common::KeyCode JOY17 = (Common::KeyCode)(FIRST_JOY + 57);
|
||||
const Common::KeyCode JOY18 = (Common::KeyCode)(FIRST_JOY + 58);
|
||||
const Common::KeyCode JOY19 = (Common::KeyCode)(FIRST_JOY + 59);
|
||||
#endif /* HAVE_JOYSTICK_SUPPORT */
|
||||
|
||||
} // End of namespace Ultima6
|
||||
} // End of namespace Ultima
|
||||
|
||||
|
||||
Reference in new issue
Block a user