Replay pause/end screen: removed info and reordered buttons.

[neverball] / ball / st_demo.c

diff --git a/ball/st_demo.c b/ball/st_demo.c
index 4bc43ab..d612ffe 100644 (file)
--- a/ball/st_demo.c
+++ b/ball/st_demo.c
@@ -462,27 +462,25 @@ static int demo_end_enter(void)
 
         if ((jd = gui_harray(id)))
         {
-            if (demo_paused)
-                gui_start(jd, _("Continue"), GUI_SML, DEMO_CONTINUE, 0);
-            else
-                gui_start(jd, _("Replay Again"), GUI_SML, DEMO_REPLAY, 0);
+            int start_id = 0;
 
             if (simple_play)
-                gui_start(jd, _("OK"),       GUI_SML, DEMO_QUIT,   1);
+            {
+                start_id = gui_start(jd, _("Quit"), GUI_SML, DEMO_QUIT, 1);
+            }
             else
             {
-                gui_start(jd, _("Keep"),     GUI_SML, DEMO_KEEP,   1);
-                gui_state(jd, _("Delete"),   GUI_SML, DEMO_DEL,    0);
+                start_id = gui_start(jd, _("Keep"), GUI_SML, DEMO_KEEP, 1);
+                gui_state(jd, _("Delete"), GUI_SML, DEMO_DEL, 0);
             }
-        }
-
-        gui_filler(id);
 
-        if ((jd = gui_hstack(id)))
-        {
-            gui_filler(jd);
-            gui_demo_status(jd, curr_demo_replay());
-            gui_filler(jd);
+            if (demo_paused)
+            {
+                gui_start(jd, _("Continue"), GUI_SML, DEMO_CONTINUE, 1);
+                gui_toggle(start_id);
+            }
+            else
+                gui_state(jd, _("Repeat"),   GUI_SML, DEMO_REPLAY,   0);
         }
 
         gui_pulse(kd, 1.2f);