[Super-tux-commit] supertux/src menu.cpp,1.57,1.58 setup.cpp,1.63,1.64
Brought to you by:
wkendrick
From: Ingo R. <gr...@us...> - 2004-04-28 20:51:33
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10651 Modified Files: menu.cpp setup.cpp Log Message: - removed joystick setup menu, since it won't work anyway - changed wording from key to keyboard - fixed strcpy versus change_input Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- menu.cpp 25 Apr 2004 21:55:39 -0000 1.57 +++ menu.cpp 28 Apr 2004 20:51:24 -0000 1.58 @@ -158,43 +158,47 @@ switch(*item->int_p) { case SDLK_UP: - strcpy(item->input, "Up cursor"); + item->change_input("Up cursor"); break; case SDLK_DOWN: - strcpy(item->input, "Down cursor"); + item->change_input("Down cursor"); break; case SDLK_LEFT: - strcpy(item->input, "Left cursor"); + item->change_input("Left cursor"); break; case SDLK_RIGHT: - strcpy(item->input, "Right cursor"); + item->change_input("Right cursor"); break; case SDLK_RETURN: - strcpy(item->input, "Return"); + item->change_input("Return"); break; case SDLK_SPACE: - strcpy(item->input, "Space"); + item->change_input("Space"); break; case SDLK_RSHIFT: - strcpy(item->input, "Right Shift"); + item->change_input("Right Shift"); break; case SDLK_LSHIFT: - strcpy(item->input, "Left Shift"); + item->change_input("Left Shift"); break; case SDLK_RCTRL: - strcpy(item->input, "Right Control"); + item->change_input("Right Control"); break; case SDLK_LCTRL: - strcpy(item->input, "Left Control"); + item->change_input("Left Control"); break; case SDLK_RALT: - strcpy(item->input, "Right Alt"); + item->change_input("Right Alt"); break; case SDLK_LALT: - strcpy(item->input, "Left Alt"); + item->change_input("Left Alt"); break; default: - strcpy(item->input, (char*)item->int_p); + { + char tmp[64]; + snprintf(tmp, 64, "%d", *item->int_p); + item->change_input(tmp); + } break; } } Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- setup.cpp 28 Apr 2004 13:18:54 -0000 1.63 +++ setup.cpp 28 Apr 2004 20:51:25 -0000 1.64 @@ -405,9 +405,11 @@ 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); |