Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7254/src
Modified Files:
worldmap.cpp
Log Message:
Let navigate through the worldmap using Tux keys as well.
Requested by Jonas Koelker <jon...@ya...>.
Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- worldmap.cpp 25 Oct 2004 03:32:50 -0000 1.127
+++ worldmap.cpp 25 Oct 2004 10:49:07 -0000 1.128
@@ -681,7 +681,8 @@
WorldMap::get_input()
{
enter_level = false;
-
+ SDLKey key;
+
SDL_Event event;
while (SDL_PollEvent(&event))
{
@@ -698,32 +699,22 @@
break;
case SDL_KEYDOWN:
- switch(event.key.keysym.sym)
- {
- case SDLK_ESCAPE:
- on_escape_press();
- break;
- case SDLK_LCTRL:
- case SDLK_RETURN:
- enter_level = true;
- break;
-
- case SDLK_LEFT:
- tux->set_direction(D_WEST);
- break;
- case SDLK_RIGHT:
- tux->set_direction(D_EAST);
- break;
- case SDLK_UP:
- tux->set_direction(D_NORTH);
- break;
- case SDLK_DOWN:
- tux->set_direction(D_SOUTH);
- break;
+ key = event.key.keysym.sym;
- default:
- break;
- }
+ if(key == SDLK_ESCAPE)
+ on_escape_press();
+ else if(key == SDLK_RETURN || key == keymap.power)
+ enter_level = true;
+ else if(key == SDLK_LEFT || key == keymap.power)
+ tux->set_direction(D_WEST);
+ else if(key == SDLK_RIGHT || key == keymap.right)
+ tux->set_direction(D_EAST);
+ else if(key == SDLK_UP || key == keymap.up ||
+ key == keymap.jump)
+ // there might be ppl that use jump as up key
+ tux->set_direction(D_NORTH);
+ else if(key == SDLK_DOWN || key == keymap.down)
+ tux->set_direction(D_SOUTH);
break;
case SDL_JOYHATMOTION:
|
