Remove "Credits" tab from the Help screen. Also rename a bunch of state

[neverball] / ball / demo.c

diff --git a/ball/demo.c b/ball/demo.c
index c0f6901..795a96c 100644 (file)
--- a/ball/demo.c
+++ b/ball/demo.c
@@ -27,7 +27,9 @@
 /*---------------------------------------------------------------------------*/
 
 #define MAGIC           0x52424EAF
-#define DEMO_VERSION    1
+#define DEMO_VERSION    3
+
+#define DATELEN 20         
 
 static FILE *demo_fp;
 
@@ -40,7 +42,6 @@ void demo_dump_info(const struct demo *d)
 {
     printf("Name:         %s\n"
            "File:         %s\n"
-           "NB Version:   %s\n"
            "Time:         %d\n"
            "Coins:        %d\n"
            "Mode:         %d\n"
@@ -58,7 +59,6 @@ void demo_dump_info(const struct demo *d)
            "Balls:        %d\n"
            "Total Time:   %d\n",
            d->name, d->filename,
-           d->nb_version,
            d->timer, d->coins, d->mode, d->state, ctime(&d->date),
            d->player,
            d->shot, d->file, d->back, d->grad, d->song,
@@ -92,7 +92,7 @@ static int demo_header_read(FILE *fp, struct demo *d)
     int t;
 
     struct tm date;
-    char datestr[20];
+    char datestr[DATELEN];
 
     get_index(fp, &magic);
     get_index(fp, &version);
@@ -107,10 +107,9 @@ static int demo_header_read(FILE *fp, struct demo *d)
         get_index(fp, &d->state);
         get_index(fp, &d->mode);
 
-#if 0
-        get_index(fp, (int *) &d->date);
-#endif
-        fread(datestr, 1, 20, fp);
+        fread(d->player, 1, MAXNAM, fp);
+
+        fread(datestr, 1, DATELEN, fp);
         sscanf(datestr,
                "%d-%d-%dT%d:%d:%d",
                &date.tm_year,
@@ -127,13 +126,8 @@ static int demo_header_read(FILE *fp, struct demo *d)
 
         d->date = make_time_from_utc(&date);
 
-        fread(d->player, 1, MAXNAM, fp);
-
         fread(d->shot, 1, PATHMAX, fp);
         fread(d->file, 1, PATHMAX, fp);
-        fread(d->back, 1, PATHMAX, fp);
-        fread(d->grad, 1, PATHMAX, fp);
-        fread(d->song, 1, PATHMAX, fp);
 
         get_index(fp, &d->time);
         get_index(fp, &d->goal);
@@ -141,56 +135,40 @@ static int demo_header_read(FILE *fp, struct demo *d)
         get_index(fp, &d->balls);
         get_index(fp, &d->times);
 
-        fread(d->nb_version, 1, 20, fp);
-
         return 1;
     }
     return 0;
 }
 
-static FILE *demo_header_open(const char *filename, struct demo *d)
+static char *bname(const char *name, const char *suffix)
 {
-    FILE *fp;
+    static char buf[MAXSTR];
 
-    if ((fp = fopen(filename, FMODE_RB)))
-    {
-        if (demo_header_read(fp, d))
-        {
-            char buf[MAXSTR];
-            char *basename;
-            int l;
-
-            strncpy(d->filename, filename, MAXSTR);
+    char *base;
+    size_t l;
 
-            /* Remove the directory delimiter */
+    /* Remove the directory delimiter */
 
-            basename = strrchr(filename, '/');
+    base = strrchr(name, '/');
 #ifdef _WIN32
-            if (!basename)
-                basename = strrchr(filename, '\\');
-            else
-            {
-                char *tmp;
-                if ((tmp = strrchr(basename, '\\')))
-                    basename = tmp;
-            }
+    if (!base)
+        base = strrchr(name, '\\');
+    else
+    {
+        char *tmp;
+        if ((tmp = strrchr(base, '\\')))
+            base = tmp;
+    }
 #endif
-            strncpy(buf, basename ? basename + 1 : filename, MAXSTR);
+    strncpy(buf, base ? base + 1 : name, MAXSTR);
 
-            /* Remove the extension */
+    /* Remove the extension */
 
-            l = strlen(buf) - strlen(REPLAY_EXT);
-            if ((l > 1) && (strcmp(buf + l, REPLAY_EXT) == 0))
-                buf[l] = '\0';
-
-            strncpy(d->name, buf, PATHMAX);
-            d->name[PATHMAX - 1] = '\0';
+    l = strlen(buf) - strlen(suffix);
+    if ((l > 1) && (strcmp(buf + l, suffix) == 0))
+        buf[l] = '\0';
 
-            return fp;
-        }
-        fclose(fp);
-    }
-    return NULL;
+    return buf;
 }
 
 static void demo_header_write(FILE *fp, struct demo *d)
@@ -199,9 +177,9 @@ static void demo_header_write(FILE *fp, struct demo *d)
     int version = DEMO_VERSION;
     int zero  = 0;
 
-    char datestr[20];
+    char datestr[DATELEN];
 
-    strftime(datestr, 20, "%Y-%m-%dT%H:%M:%S", gmtime(&d->date));
+    strftime(datestr, DATELEN, "%Y-%m-%dT%H:%M:%S", gmtime(&d->date));
 
     put_index(fp, &magic);
     put_index(fp, &version);
@@ -210,26 +188,17 @@ static void demo_header_write(FILE *fp, struct demo *d)
     put_index(fp, &zero);
     put_index(fp, &d->mode);
 
-#if 0
-    put_index(fp, (int *) &d->date);
-#endif
-    fwrite(datestr, 1, 20, fp);
-
     fwrite(d->player, 1, MAXNAM, fp);
+    fwrite(datestr, 1, DATELEN, fp);
 
     fwrite(d->shot, 1, PATHMAX, fp);
     fwrite(d->file, 1, PATHMAX, fp);
-    fwrite(d->back, 1, PATHMAX, fp);
-    fwrite(d->grad, 1, PATHMAX, fp);
-    fwrite(d->song, 1, PATHMAX, fp);
 
     put_index(fp, &d->time);
     put_index(fp, &d->goal);
     put_index(fp, &d->score);
     put_index(fp, &d->balls);
     put_index(fp, &d->times);
-
-    fwrite(d->nb_version, 1, 20, fp);
 }
 
 /* Update the demo header using the final level state. */
@@ -254,9 +223,16 @@ static void demo_scan_file(const char *filename)
     FILE *fp;
     struct demo *d = &demos[count];
 
-    if ((fp = demo_header_open(config_user(filename), d)))
+    if ((fp = fopen(config_user(filename), FMODE_RB)))
     {
-        count++;
+        if (demo_header_read(fp, d))
+        {
+            strncpy(d->filename, config_user(filename),       MAXSTR);
+            strncpy(d->name,     bname(filename, REPLAY_EXT), PATHMAX);
+            d->name[PATHMAX - 1] = '\0';
+
+            count++;
+        }
         fclose(fp);
     }
 }
@@ -328,7 +304,7 @@ const char *date_to_str(time_t i)
 
 /*---------------------------------------------------------------------------*/
 
-int demo_exists(char *name)
+int demo_exists(const char *name)
 {
     FILE *fp;
     char buf[MAXSTR];
@@ -388,8 +364,6 @@ int demo_play_init(const char *name,
     demo.balls = lg->balls;
     demo.times = lg->times;
 
-    strncpy(demo.nb_version, VERSION, 20);
-
     if (demo.filename && (demo_fp = fopen(demo.filename, FMODE_WB)))
     {
         demo_header_write(demo_fp, &demo);
@@ -438,6 +412,10 @@ void demo_play_save(const char *name)
         strncpy(dst, config_user(name), PATHMAX);
         strcat(dst, REPLAY_EXT);
 
+#ifdef _WIN32
+        if (demo_exists(name))
+            remove(dst);
+#endif
         rename(src, dst);
     }
 }
@@ -467,10 +445,13 @@ const struct demo *curr_demo_replay(void)
 
 int demo_replay_init(const char *name, struct level_game *lg)
 {
-    demo_fp = demo_header_open(name, &demo_replay);
+    demo_fp = fopen(name, FMODE_RB);
 
-    if (demo_fp)
+    if (demo_fp && demo_header_read(demo_fp, &demo_replay))
     {
+        strncpy(demo_replay.filename, name,                    MAXSTR);
+        strncpy(demo_replay.name,     bname(name, REPLAY_EXT), PATHMAX);
+
         if (!demo_load_level(&demo_replay, &demo_level_replay))
             return 0;