#include <config.h>
-#include <sstream>
#include "joystickkeyboardcontroller.hpp"
+
+#include <sstream>
+
#include "log.hpp"
#include "gui/menu.hpp"
#include "gettext.hpp"
+#include "lisp/writer.hpp"
#include "lisp/lisp.hpp"
#include "lisp/list_iterator.hpp"
#include "game_session.hpp"
keymap[SDLK_KP_ENTER] = MENU_SELECT;
keymap[SDLK_CARET] = CONSOLE;
keymap[SDLK_DELETE] = PEEK_LEFT;
- keymap[SDLK_END] = PEEK_RIGHT;
- keymap[SDLK_PAGEUP] = PEEK_UP;
- keymap[SDLK_PAGEDOWN] = PEEK_DOWN;
+ keymap[SDLK_PAGEDOWN] = PEEK_RIGHT;
+ keymap[SDLK_HOME] = PEEK_UP;
+ keymap[SDLK_END] = PEEK_DOWN;
jump_with_up_joy = false;
jump_with_up_kbd = false;
else
{
// Split the axis into left and right, so that both can be
- // mapped seperatly (needed for jump/down vs up/down)
+ // mapped separately (needed for jump/down vs up/down)
int axis = jaxis.axis + 1;
AxisMap::iterator left = joy_axis_map.find(-axis);
process_menu_key_event(event);
} else if(key_mapping == keymap.end()) {
// default action: update controls
- log_debug << "Key " << event.key.keysym.sym << " is unbound" << std::endl;
+ //log_debug << "Key " << event.key.keysym.sym << " is unbound" << std::endl;
} else {
Control control = key_mapping->second;
controls[control] = (event.type == SDL_KEYDOWN);
default:
int c = event.key.keysym.unicode;
if ((c >= 32) && (c <= 126)) {
- Console::instance->input((char)c);
+ Console::instance->input((char)c);
}
break;
}
add_toggle(Controller::CONTROLCOUNT, _("Jump with Up"), controller->jump_with_up_joy);
} else {
- add_deactive(-1, _("No Joysticks found"));
+ add_inactive(-1, _("No Joysticks found"));
}
- add_deactive(-1,"");
+ add_inactive(-1,"");
add_entry(SCAN_JOYSTICKS, _("Scan for Joysticks"));
//Show Joysticks currently activated:
for(std::vector<SDL_Joystick*>::iterator i = controller->joysticks.begin();
i != controller->joysticks.end(); ++i) {
if(*i != 0)
- add_deactive(-1, SDL_JoystickName(SDL_JoystickIndex(*i)) );
+ add_inactive(-1, SDL_JoystickName(SDL_JoystickIndex(*i)) );
}
add_hl();