On game over, do not return to the title screen but to the level selection menu.

git-svn-id: https://s.snth.net/svn/neverball/trunk@58 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/st_goal.c b/ball/st_goal.c
index f4f5f5d..3d61096 100644 (file)
--- a/ball/st_goal.c
+++ b/ball/st_goal.c
@@ -27,7 +27,7 @@
 #include "st_save.h"
 #include "st_over.h"
 #include "st_done.h"
-#include "st_title.h"
+#include "st_start.h"
 #include "st_level.h"
 
 /*---------------------------------------------------------------------------*/
@@ -69,7 +69,7 @@ static int goal_action(int i)
         else if (level_mode() == MODE_CHALLENGE)
             return goto_state(&st_done);
        else
-           return goto_state(&st_title);
+           return goto_state(&st_start);
 
     case GOAL_SAME:
         while (level_count())

diff --git a/ball/st_over.c b/ball/st_over.c
index f294274..8f460be 100644 (file)
--- a/ball/st_over.c
+++ b/ball/st_over.c
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "st_over.h"
-#include "st_title.h"
+#include "st_start.h"
 
 /*---------------------------------------------------------------------------*/
 
@@ -44,9 +44,7 @@ static int over_enter(void)
 
 static void over_leave(int id)
 {
-    level_exit(NULL, 0);
     gui_delete(id);
-    set_free();
 }
 
 static void over_paint(int id, float st)
@@ -58,7 +56,7 @@ static void over_paint(int id, float st)
 static void over_timer(int id, float dt)
 {
     if (dt > 0.f && time_state() > 3.f)
-        goto_state(&st_title);
+        goto_state(&st_start);
 
     gui_timer(id, dt);
     audio_timer(dt);
@@ -66,24 +64,22 @@ static void over_timer(int id, float dt)
 
 static int over_keybd(int c, int d)
 {
-    return (d && c == SDLK_ESCAPE) ? goto_state(&st_title) : 1;
+    return (d && c == SDLK_ESCAPE) ? goto_state(&st_start) : 1;
 }
 
 static int over_click(int b, int d)
 {
-    return (b < 0 && d == 1) ? goto_state(&st_title) : 1;
+    return (b < 0 && d == 1) ? goto_state(&st_start) : 1;
 }
 
 static int over_buttn(int b, int d)
 {
     if (d)
     {
-        if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
-            return goto_state(&st_title);
-        if (config_tst_d(CONFIG_JOYSTICK_BUTTON_B, b))
-            return goto_state(&st_title);
-        if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-            return goto_state(&st_title);
+        if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b) ||
+            config_tst_d(CONFIG_JOYSTICK_BUTTON_B, b) ||
+            config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
+            return goto_state(&st_start);
     }
     return 1;
 }