Those sets haven't been merged.

[neverball] / ball / st_done.c

diff --git a/ball/st_done.c b/ball/st_done.c
index 869f55f..5672fe5 100644 (file)
--- a/ball/st_done.c
+++ b/ball/st_done.c
@@ -1,4 +1,4 @@
-/*   
+/*
  * Copyright (C) 2003 Robert Kooima
  *
  * NEVERBALL is  free software; you can redistribute  it and/or modify
@@ -19,64 +19,36 @@
 #include "game.h"
 #include "util.h"
 #include "demo.h"
-#include "level.h"
+#include "levels.h"
 #include "audio.h"
 #include "config.h"
+#include "st_shared.h"
 
 #include "st_done.h"
-#include "st_title.h"
+#include "st_start.h"
+#include "st_name.h"
 
 /*---------------------------------------------------------------------------*/
 
-#define DONE_OK 2
+#define DONE_OK   1
+#define DONE_NAME 2
 
-static int high;
-static int time_i;
-static int coin_i;
+/* Bread crumbs. */
+
+static int new_name;
 
 static int done_action(int i)
 {
-    char player[MAXNAM];
-    size_t l;
-
     audio_play(AUD_MENU, 1.0f);
 
-    config_get_s(CONFIG_PLAYER, player, MAXNAM);
-    l = strlen(player);
-
     switch (i)
     {
     case DONE_OK:
-        level_free();
-        return goto_state(&st_title);
-
-    case GUI_CL:
-        gui_keyboard_lock();
-        break;
-
-    case GUI_BS:
-        if (l > 0)
-        {
-            player[l - 1] = 0;
+        return goto_state(&st_start);
 
-            config_set_s(CONFIG_PLAYER, player);
-            level_name(0, player, time_i, coin_i);
-            set_most_coins(0, 4);
-            set_best_times(0, 4);
-        }
-        break;
-
-    default:
-        if (l < MAXNAM - 1)
-        {
-            player[l + 0] = gui_keyboard_char((char) i);
-            player[l + 1] = 0;
-
-            config_set_s(CONFIG_PLAYER, player);
-            level_name(0, player, time_i, coin_i);
-            set_most_coins(0, 4);
-            set_best_times(0, 4);
-        }
+    case DONE_NAME:
+        new_name = 1;
+        return goto_name(&st_done, &st_done, 0);
     }
     return 1;
 }
@@ -88,9 +60,13 @@ static int done_enter(void)
 
     int id, jd;
 
-    time_i = 3;
-    coin_i = 3;
-    high   = level_done(&time_i, &coin_i);
+    int high = (curr_lg()->times_rank < 3) || (curr_lg()->score_rank < 3);
+
+    if (new_name)
+    {
+        level_update_player_name();
+        new_name = 0;
+    }
 
     if ((id = gui_vstack(0)))
     {
@@ -105,77 +81,40 @@ static int done_enter(void)
 
         if ((jd = gui_harray(id)))
         {
-            gui_most_coins(jd, 4, coin_i);
-            gui_best_times(jd, 4, time_i);
+            gui_most_coins(jd, 1);
+            gui_best_times(jd, 1);
         }
 
         gui_space(id);
-        gui_start(id, _("Main Menu"), GUI_SML, DONE_OK, 0);
 
-        if (high) gui_keyboard(id);
+        if ((jd = gui_harray(id)))
+        {
+            /* FIXME, I'm ugly. */
+
+            if (high)
+               gui_state(jd, _("Change Player Name"), GUI_SML, DONE_NAME, 0);
+
+            gui_start(jd, _("OK"), GUI_SML, DONE_OK, 0);
+        }
 
         gui_layout(id, 0, 0);
         gui_pulse(gid, 1.2f);
     }
 
-    set_most_coins(0, 4);
-    set_best_times(0, 4);
+    set_best_times(&curr_set()->time_score, curr_lg()->times_rank, 0);
+    set_most_coins(&curr_set()->coin_score, curr_lg()->score_rank);
 
     return id;
 }
 
-static void done_leave(int id)
-{
-    gui_delete(id);
-}
-
-static void done_paint(int id, float st)
-{
-    game_draw(0, st);
-    gui_paint(id);
-}
-
-static void done_timer(int id, float dt)
-{
-    gui_timer(id, dt);
-    audio_timer(dt);
-}
-
-static void done_point(int id, int x, int y, int dx, int dy)
-{
-    gui_pulse(gui_point(id, x, y), 1.2f);
-}
-
-static void done_stick(int id, int a, int v)
-{
-    if (config_tst_d(CONFIG_JOYSTICK_AXIS_X, a))
-        gui_pulse(gui_stick(id, v, 0), 1.2f);
-    if (config_tst_d(CONFIG_JOYSTICK_AXIS_Y, a))
-        gui_pulse(gui_stick(id, 0, v), 1.2f);
-}
-
-static int done_click(int b, int d)
-{
-    if (b <= 0 && d == 1)
-        return done_action(gui_token(gui_click()));
-    return 1;
-}
-
-static int done_keybd(int c, int d)
-{
-    if (d && c == SDLK_ESCAPE)
-        goto_state(&st_title);
-    return 1;
-}
-
 static int done_buttn(int b, int d)
 {
     if (d)
     {
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
-            return done_click(0, 1);
+            return done_action(gui_token(gui_click()));
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-            return goto_state(&st_title);
+            return done_action(DONE_OK);
     }
     return 1;
 }
@@ -184,14 +123,14 @@ static int done_buttn(int b, int d)
 
 struct state st_done = {
     done_enter,
-    done_leave,
-    done_paint,
-    done_timer,
-    done_point,
-    done_stick,
-    done_click,
-    done_keybd,
+    shared_leave,
+    shared_paint,
+    shared_timer,
+    shared_point,
+    shared_stick,
+    shared_angle,
+    shared_click,
+    NULL,
     done_buttn,
     1, 0
 };
-