Fixed JGE key binding in SDL config

This commit is contained in:
Xawotihs
2011-05-26 21:24:17 +00:00
parent 5cf764310e
commit 0e26368c89
4 changed files with 18 additions and 23 deletions
+5 -7
View File
@@ -33,18 +33,16 @@ const string Options::optionNames[] = {
"transitions",
"bgStyle",
"interruptSeconds",
#if defined(QT_CONFIG)
#if defined(SDL_CONFIG)
"keybindings_sdl",
#elif defined(QT_CONFIG)
"keybindings_qt",
#else
#if defined(WIN32)
#elif defined(WIN32)
"keybindings_win",
#else
#if defined(LINUX)
#elif defined(LINUX)
"keybindings_x",
#else
"keybindings_psp",
#endif
#endif
#endif
"aidecks",
"interruptMySpells",
+2 -5
View File
@@ -12,7 +12,7 @@ using std::map;
static map<const LocalKeySym, KeyRep> fattable;
static map<const JButton, KeyRep> slimtable;
#if defined(LINUX) || defined (IOS) || defined (ANDROID)
#if defined(LINUX) || defined (IOS) || defined (ANDROID) || defined (SDL_CONFIG) || defined (QT_CONFIG)
const KeyRep& translateKey(LocalKeySym key)
{
{
@@ -37,9 +37,7 @@ const KeyRep& translateKey(LocalKeySym key)
fattable[key] = k;
return fattable[key];
}
#else
#ifdef WIN32
#elif defined(WIN32)
const KeyRep& translateKey(LocalKeySym key)
{
{
@@ -135,7 +133,6 @@ const KeyRep& translateKey(LocalKeySym key)
return k;
}
#endif
#endif
const KeyRep& translateKey(JButton key) {
/*