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

[neverball] / ball / st_demo.c

diff --git a/ball/st_demo.c b/ball/st_demo.c
index b5a2665..7a3a085 100644 (file)
--- a/ball/st_demo.c
+++ b/ball/st_demo.c
@@ -80,7 +80,7 @@ static void demo_replay(int id, int i)
     if ((jd = gui_vstack(id)))
     {
         gui_space(jd);
-        gui_image(jd, demo_get(i)->level->shot, w / 6, h / 6);
+        gui_image(jd, demo_get(i)->shot, w / 6, h / 6);
 
         nam[MAXNAM - 1] = '\0';
         strncpy(nam, demo_get(i)->name, MAXNAM);
@@ -101,7 +101,6 @@ static int name_id;
 static int time_id;
 static int coin_id;
 static int date_id;
-static int level_id;
 static int mode_id;
 static int state_id;
 static int player_id;
@@ -112,7 +111,6 @@ static int player_id;
 static int gui_demo_status(int id, const struct demo *d)
 {
     char noname[MAXNAM];
-    char levelname[MAXSTR];
     const char *mode, *state;
     int i, j, k;
     int jd, kd, ld, md;
@@ -148,16 +146,11 @@ static int gui_demo_status(int id, const struct demo *d)
                 state = state_to_str(i);
             }
         }
-
-        strcpy(levelname, "M");
     }
     else
     {
         mode = mode_to_str(d->mode);
         state = state_to_str(d->state);
-        strcpy(levelname, _(d->level->set->name));
-        strcat(levelname, " - ");
-        strcat(levelname, d->level->repr);
     }
 
     if ((jd = gui_hstack(id)))
@@ -193,7 +186,6 @@ static int gui_demo_status(int id, const struct demo *d)
                     mode_id = gui_label(md, mode, GUI_SML, GUI_RGT, 0, 0);
                 }
             }
-            level_id = gui_label(kd, (levelname), GUI_SML, GUI_RGT, 0, 0);
             date_id = gui_label(kd, (d ? date_to_str(d->date) : "M"),
                                 GUI_SML, GUI_RGT, 0, 0);
         }
@@ -202,7 +194,6 @@ static int gui_demo_status(int id, const struct demo *d)
             gui_label(kd, _("Replay"), GUI_SML, GUI_LFT, gui_wht, gui_wht);
             gui_label(kd, _("Time"),   GUI_SML, GUI_LFT, gui_wht, gui_wht);
             gui_label(kd, _("Mode"),   GUI_SML, GUI_LFT, gui_wht, gui_wht);
-            gui_label(kd, _("Level"),  GUI_SML, GUI_LFT, gui_wht, gui_wht);
             gui_label(kd, _("Date"),   GUI_SML, GUI_LFT, gui_wht, gui_wht);
         }
         if (d && (d->state == GAME_GOAL || d->state == GAME_SPEC))
@@ -214,15 +205,9 @@ static int gui_demo_status(int id, const struct demo *d)
 static void gui_demo_update_status(int i)
 {
     const struct demo *d = demo_get(i);
-    char levelname[MAXSTR];
-    
-    strcpy(levelname, _(d->level->set->name));
-    strcat(levelname, " - ");
-    strcat(levelname, d->level->repr);
 
     gui_set_label(name_id,   d->name);
     gui_set_label(date_id,   date_to_str(d->date));
-    gui_set_label(level_id,  levelname);
     gui_set_label(player_id, d->player);
     gui_set_label(mode_id,   mode_to_str(d->mode));