Remove drawball for real this time and fix an accidental regression.

[neverball] / ball / st_play_end.c

diff --git a/ball/st_play_end.c b/ball/st_play_end.c
index 216f2c8..6012dee 100644 (file)
--- a/ball/st_play_end.c
+++ b/ball/st_play_end.c
@@ -1,4 +1,4 @@
-/*   
+/*
  * Copyright (C) 2003 Robert Kooima
  *
  * NEVERBALL is  free software; you can redistribute  it and/or modify
@@ -45,6 +45,7 @@
 static int balls_id;
 static int coins_id;
 static int score_id;
+static int status_id;
 
 extern struct state st_play_end_bis;
 
@@ -63,10 +64,10 @@ static int play_end_action(int i)
 
     case PLAY_END_NAME:
         return goto_name(&st_play_end_bis, &st_play_end_bis);
-        
+
     case PLAY_END_DONE:
         return goto_state(&st_done);
-        
+
     case PLAY_END_NEXT:
         level_next();
         return goto_state(&st_level);
@@ -78,6 +79,59 @@ static int play_end_action(int i)
     return 1;
 }
 
+static void play_end_over(int id)
+{
+    if (id == 0)
+        return;
+
+    switch (gui_token(id))
+    {
+        case 0:
+            break;
+
+        case PLAY_END_SAVE:
+            gui_set_label(status_id, _("Save a replay file"));
+            break;
+
+        case PLAY_END_SAVE | GUI_NULL_MASK:
+            gui_set_label(status_id, _("Replay file already saved"));
+            break;
+
+        case PLAY_END_NAME:
+            gui_set_label(status_id, _("Change the player's name"));
+            break;
+
+        case PLAY_END_DONE:
+            gui_set_label(status_id, _("You complete the set"));
+            break;
+
+        case PLAY_END_NEXT:
+            gui_set_label(status_id, _("Play the next level"));
+            break;
+
+        case PLAY_END_NEXT | GUI_NULL_MASK:
+            if (curr_lg()->mode == MODE_PRACTICE)
+                gui_set_label(status_id, 
+                        _("Cannot unlock in practice mode"));
+            else
+                gui_set_label(status_id, 
+                        _("Finish this level to unlock the next one"));
+            break;
+
+        case PLAY_END_SAME:
+            gui_set_label(status_id, _("Replay this level"));
+            break;
+
+        case PLAY_END_SAME | GUI_NULL_MASK:
+            gui_set_label(status_id, _("You cannot replay in challenge mode"));
+            break;
+
+        default:
+            gui_set_label(status_id, "");
+    }
+}
+
+
 static int play_end_init(int *gidp)
 {
     const struct level_game *lg = curr_lg();
@@ -112,7 +166,7 @@ static int play_end_init(int *gidp)
 
         gui_space(id);
 
-        if (mode == MODE_CHALLENGE && 
+        if (mode == MODE_CHALLENGE &&
             (lg->state == GAME_GOAL || lg->state == GAME_SPEC || l->is_bonus))
         {
             int coins = lg->coins;
@@ -145,7 +199,7 @@ static int play_end_init(int *gidp)
         {
             balls_id = score_id = coins_id = 0;
         }
-        
+
         if (state == GAME_GOAL)
         {
             gui_space(id);
@@ -176,7 +230,7 @@ static int play_end_init(int *gidp)
                 b = mode != MODE_CHALLENGE || ((state == GAME_FALL || state == GAME_TIME) && !lg->dead && !l->is_bonus);
                 rlid = gui_maybe(jd, _("Retry Level"), PLAY_END_SAME, b);
             }
-            
+
             gui_maybe(jd, _("Save Replay"), PLAY_END_SAVE, demo_play_saved());
 
             /* default is next if the next level is newly unkocked */
@@ -189,17 +243,20 @@ static int play_end_init(int *gidp)
         if (high)
             gui_state(id, _("Change Player Name"),  GUI_SML, PLAY_END_NAME, 0);
 
+        gui_space(id);
+        status_id = gui_label(id, "Neverball", GUI_SML, GUI_ALL, 0, 0);
+
         gui_layout(id, 0, 0);
         if (gidp) *gidp = gid;
     }
 
     if (state == GAME_GOAL)
     {
-        set_most_coins(&l->coin_score, lg->coin_rank);
+        set_most_coins(&l->score.most_coins, lg->coin_rank);
         if (mode == MODE_CHALLENGE || mode == MODE_NORMAL)
-            set_best_times(&l->goal_score, lg->goal_rank, 1);
+            set_best_times(&l->score.unlock_goal, lg->goal_rank, 1);
         else
-            set_best_times(&l->time_score, lg->time_rank, 0);
+            set_best_times(&l->score.best_times, lg->time_rank, 0);
     }
 
     config_clr_grab();
@@ -211,12 +268,12 @@ static int play_end_enter(void)
 {
     int gid;
     int r;
-    
+
     r = play_end_init(&gid);
-    
+
     gui_pulse(gid, 1.2f);
     audio_music_fade_out(2.0f);
-    return r; 
+    return r;
 }
 
 static int play_end_bis_enter(void)
@@ -237,7 +294,7 @@ static void play_end_timer(int id, float dt)
 
     if (time_state() < 2.f)
         game_step((state == GAME_GOAL || state == GAME_SPEC) ? gg : gf, dt, NULL);
-    
+
     if (time_state() > 1.f && DT > 0.05f && coins_id != 0)
     {
         int coins = gui_value(coins_id);
@@ -248,7 +305,7 @@ static void play_end_timer(int id, float dt)
 
             gui_set_count(coins_id, coins - 1);
             gui_pulse(coins_id, 1.1f);
-            
+
             gui_set_count(score_id, score + 1);
             gui_pulse(score_id, 1.1f);
 
@@ -267,6 +324,16 @@ static void play_end_timer(int id, float dt)
     audio_timer(dt);
 }
 
+void play_end_stick(int id, int a, int v)
+{
+        play_end_over(shared_stick_basic(id, a, v));
+}
+
+void play_end_point(int id, int x, int y, int dx, int dy)
+{
+        play_end_over(shared_point_basic(id, x, y));
+}
+
 static int play_end_buttn(int b, int d)
 {
     if (d)
@@ -286,8 +353,8 @@ struct state st_play_end = {
     shared_leave,
     shared_paint,
     play_end_timer,
-    shared_point,
-    shared_stick,
+    play_end_point,
+    play_end_stick,
     shared_click,
     NULL,
     play_end_buttn,
@@ -299,8 +366,8 @@ struct state st_play_end_bis = {
     shared_leave,
     shared_paint,
     shared_timer,
-    shared_point,
-    shared_stick,
+    play_end_point,
+    play_end_stick,
     shared_click,
     NULL,
     play_end_buttn,