- changed wording from key to keyboard
- fixed strcpy versus change_input
SVN-Revision: 820
switch(*item->int_p)
{
case SDLK_UP:
switch(*item->int_p)
{
case SDLK_UP:
- strcpy(item->input, "Up cursor");
+ item->change_input("Up cursor");
- strcpy(item->input, "Down cursor");
+ item->change_input("Down cursor");
- strcpy(item->input, "Left cursor");
+ item->change_input("Left cursor");
- strcpy(item->input, "Right cursor");
+ item->change_input("Right cursor");
- strcpy(item->input, "Return");
+ item->change_input("Return");
- strcpy(item->input, "Space");
+ item->change_input("Space");
- strcpy(item->input, "Right Shift");
+ item->change_input("Right Shift");
- strcpy(item->input, "Left Shift");
+ item->change_input("Left Shift");
- strcpy(item->input, "Right Control");
+ item->change_input("Right Control");
- strcpy(item->input, "Left Control");
+ item->change_input("Left Control");
- strcpy(item->input, "Right Alt");
+ item->change_input("Right Alt");
- strcpy(item->input, "Left Alt");
+ item->change_input("Left Alt");
- strcpy(item->input, (char*)item->int_p);
+ {
+ char tmp[64];
+ snprintf(tmp, 64, "%d", *item->int_p);
+ item->change_input(tmp);
+ }
options_menu->additem(MN_DEACTIVE,"Music ", false,0, MNID_MUSIC);
}
options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0, MNID_SHOWFPS);
options_menu->additem(MN_DEACTIVE,"Music ", false,0, MNID_MUSIC);
}
options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0, MNID_SHOWFPS);
- options_menu->additem(MN_GOTO,"Key Setup",0,options_keys_menu);
- if(use_joystick)
- options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu);
+ options_menu->additem(MN_GOTO,"Keyboard Setup",0,options_keys_menu);
+
+ //if(use_joystick)
+ // options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu);
+
options_menu->additem(MN_HL,"",0,0);
options_menu->additem(MN_BACK,"Back",0,0);
options_menu->additem(MN_HL,"",0,0);
options_menu->additem(MN_BACK,"Back",0,0);