Those sets haven't been merged.

[neverball] / ball / st_start.c

diff --git a/ball/st_start.c b/ball/st_start.c
index e6daa84..5e90fd3 100644 (file)
--- a/ball/st_start.c
+++ b/ball/st_start.c
@@ -29,20 +29,6 @@
 
 /*---------------------------------------------------------------------------*/
 
-int goto_end_level(void)
-{
-    switch (curr_lg()->mode)
-    {
-    case MODE_CHALLENGE:
-        return goto_state(&st_over);
-    default:
-        return goto_state(&st_start);
-    }
-}
-
-
-/*---------------------------------------------------------------------------*/
-
 #define START_BACK      -1
 #define START_PRACTICE  -2
 #define START_NORMAL    -3
@@ -199,10 +185,12 @@ static int start_action(int i)
         if (!l->is_locked || config_cheat())
         {
             if (level_play(l, mode))
+            {
                 return goto_state(&st_level);
+            }
             else
             {
-                level_stop(GAME_NONE, curr_clock(), curr_coins());
+                level_stop();
                 return 1;
             }
         }
@@ -340,6 +328,7 @@ struct state st_start = {
     shared_timer,
     start_point,
     start_stick,
+    shared_angle,
     shared_click,
     start_keybd,
     start_buttn,