From: Ricardo Cruz Date: Mon, 17 May 2004 14:11:03 +0000 (+0000) Subject: Just made the keys UP code go when the menu is called. X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a28d9c1e7fc6b8b2a5c9e139560143e9b74813ea;p=supertux.git Just made the keys UP code go when the menu is called. This way they are only done once, instead of every time. Doesn't solve anything, it's just cleaner IMO. SVN-Revision: 1239 --- diff --git a/src/gameloop.cpp b/src/gameloop.cpp index 0b86cb3dd..625afee49 100644 --- a/src/gameloop.cpp +++ b/src/gameloop.cpp @@ -189,6 +189,16 @@ GameSession::on_escape_press() } else if (!Menu::current()) { + /* Tell Tux that the keys are all down, otherwise + it could have nasty bugs, like going allways to the right + or whatever that key does */ + Player& tux = *world->get_tux(); + tux.key_event((SDLKey)keymap.jump, UP); + tux.key_event((SDLKey)keymap.duck, UP); + tux.key_event((SDLKey)keymap.left, UP); + tux.key_event((SDLKey)keymap.right, UP); + tux.key_event((SDLKey)keymap.fire, UP); + Menu::set_current(game_menu); st_pause_ticks_start(); } @@ -263,18 +273,8 @@ GameSession::process_events() if (Menu::current()) { Menu::current()->event(event); - if(!Menu::current()) - st_pause_ticks_stop(); - - /* Tell Tux that the keys are all down, otherwise - it could have nasty bugs, like going allways to the right - or whatever that key does */ - Player& tux = *world->get_tux(); - tux.key_event((SDLKey)keymap.jump, UP); - tux.key_event((SDLKey)keymap.duck, UP); - tux.key_event((SDLKey)keymap.left, UP); - tux.key_event((SDLKey)keymap.right, UP); - tux.key_event((SDLKey)keymap.fire, UP); + if(!Menu::current()) + st_pause_ticks_stop(); } else {