else if (!Menu::current())
{
Menu::set_current(game_menu);
- st_pause_ticks_stop();
}
}
if (Menu::current())
{
Menu::current()->event(event);
+ st_pause_ticks_start();
}
else
{
+ st_pause_ticks_stop();
+
switch(event.type)
{
case SDL_QUIT: /* Quit event - quit: */
break;
case SDL_JOYAXISMOTION:
- switch(event.jaxis.axis)
+ if (event.jaxis.axis == joystick_keymap.x_axis)
{
- case JOY_X:
- if (event.jaxis.value < -JOYSTICK_DEAD_ZONE)
+ if (event.jaxis.value < -joystick_keymap.dead_zone)
{
tux.input.left = DOWN;
tux.input.right = UP;
}
- else if (event.jaxis.value > JOYSTICK_DEAD_ZONE)
+ else if (event.jaxis.value > joystick_keymap.dead_zone)
{
tux.input.left = UP;
tux.input.right = DOWN;
tux.input.left = DOWN;
tux.input.right = DOWN;
}
- break;
- case JOY_Y:
- if (event.jaxis.value > JOYSTICK_DEAD_ZONE)
+ }
+ else if (event.jaxis.axis == joystick_keymap.y_axis)
+ {
+ if (event.jaxis.value > joystick_keymap.dead_zone)
tux.input.down = DOWN;
- else if (event.jaxis.value < -JOYSTICK_DEAD_ZONE)
+ else if (event.jaxis.value < -joystick_keymap.dead_zone)
tux.input.down = UP;
else
tux.input.down = UP;
-
- break;
- default:
- break;
}
break;
+
case SDL_JOYBUTTONDOWN:
- if (event.jbutton.button == JOY_A)
+ if (event.jbutton.button == joystick_keymap.a_button)
tux.input.up = DOWN;
- else if (event.jbutton.button == JOY_B)
+ else if (event.jbutton.button == joystick_keymap.b_button)
tux.input.fire = DOWN;
- else if (event.jbutton.button == JOY_START)
+ else if (event.jbutton.button == joystick_keymap.start_button)
on_escape_press();
break;
case SDL_JOYBUTTONUP:
- if (event.jbutton.button == JOY_A)
+ if (event.jbutton.button == joystick_keymap.a_button)
tux.input.up = UP;
- else if (event.jbutton.button == JOY_B)
+ else if (event.jbutton.button == joystick_keymap.b_button)
tux.input.fire = UP;
break;