Merged branch utf8.

[neverball] / ball / st_pause.c

diff --git a/ball/st_pause.c b/ball/st_pause.c
index 30667d1..597884c 100644 (file)
--- a/ball/st_pause.c
+++ b/ball/st_pause.c
@@ -13,6 +13,7 @@
  */
 
 #include <SDL_mixer.h>
+
 #include "gui.h"
 #include "config.h"
 #include "game.h"
@@ -22,7 +23,7 @@
 #include "hud.h"
 
 #include "st_play.h"
-#include "st_start.h"
+#include "st_over.h"
 #include "st_shared.h"
 #include "st_pause.h"
 
@@ -66,10 +67,8 @@ static int pause_action(int i)
         return goto_state(st_continue);
 
     case PAUSE_RESTART:
-        level_stat(GAME_NONE, curr_clock(), curr_coins());
-        level_stop();
+        level_same();
         clear_pause();
-        level_play(curr_lg()->level, curr_lg()->mode);
         Mix_ResumeMusic();
         config_set_grab(1);
         return goto_state(&st_play_ready);
@@ -78,12 +77,13 @@ static int pause_action(int i)
         level_stat(GAME_NONE, curr_clock(), curr_coins());
         level_stop();
         clear_pause();
-        return goto_state(&st_start);
+        return goto_state(&st_over);
     }
 
     return 1;
 }
 
+/*---------------------------------------------------------------------------*/
 
 static int pause_enter(void)
 {
@@ -125,13 +125,13 @@ static int pause_enter(void)
     return id;
 }
 
-void pause_paint(int id, float st)
+static void pause_paint(int id, float st)
 {
     shared_paint(id, st);
     hud_paint();
 }
 
-void pause_timer(int id, float dt)
+static void pause_timer(int id, float dt)
 {
     gui_timer(id, dt);
     hud_timer (dt);
@@ -160,7 +160,7 @@ static int pause_buttn(int b, int d)
 
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
         {
-            if (SDL_GetModState() & (KMOD_SHIFT | KMOD_CTRL | KMOD_ALT | KMOD_META))
+            if (SDL_GetModState() & KMOD_SHIFT)
                 return pause_action(PAUSE_EXIT);
             else
                 return pause_action(PAUSE_CONTINUE);