Isolate basename stuff in a completely separate function bname(),
[neverball] / ball / demo.c
index 9092845..2d132c9 100644 (file)
@@ -19,7 +19,6 @@
 
 #include "demo.h"
 #include "game.h"
-#include "set.h"
 #include "audio.h"
 #include "solid.h"
 #include "config.h"
@@ -28,7 +27,7 @@
 /*---------------------------------------------------------------------------*/
 
 #define MAGIC           0x52424EAF
-#define DEMO_VERSION    2
+#define DEMO_VERSION    1
 
 static FILE *demo_fp;
 
@@ -48,7 +47,11 @@ void demo_dump_info(const struct demo *d)
            "State:        %d\n"
            "Date:         %s"
            "Player:       %s\n"
-           "Level:        %s (%s)\n"
+           "Shot:         %s\n"
+           "Level:        %s\n"
+           "  Back:       %s\n"
+           "  Grad:       %s\n"
+           "  Song:       %s\n"
            "Time:         %d\n"
            "Goal:         %d\n"
            "Score:        %d\n"
@@ -58,16 +61,39 @@ void demo_dump_info(const struct demo *d)
            d->nb_version,
            d->timer, d->coins, d->mode, d->state, ctime(&d->date),
            d->player,
-           d->l_name, d->l_ver,
+           d->shot, d->file, d->back, d->grad, d->song,
            d->time, d->goal, d->score, d->balls, d->times);
 }
 
+static time_t make_time_from_utc(struct tm *tm)
+{
+    struct tm local, *utc;
+    time_t t;
+
+    t = mktime(tm);
+
+    local = *localtime(&t);
+    utc   =  gmtime(&t);
+
+    local.tm_year += local.tm_year - utc->tm_year;
+    local.tm_mon  += local.tm_mon  - utc->tm_mon ;
+    local.tm_mday += local.tm_mday - utc->tm_mday;
+    local.tm_hour += local.tm_hour - utc->tm_hour;
+    local.tm_min  += local.tm_min  - utc->tm_min ;
+    local.tm_sec  += local.tm_sec  - utc->tm_sec ;
+
+    return mktime(&local);
+}
+
 static int demo_header_read(FILE *fp, struct demo *d)
 {
     int magic;
     int version;
     int t;
 
+    struct tm date;
+    char datestr[20];
+
     get_index(fp, &magic);
     get_index(fp, &version);
 
@@ -80,12 +106,34 @@ static int demo_header_read(FILE *fp, struct demo *d)
         get_index(fp, &d->coins);
         get_index(fp, &d->state);
         get_index(fp, &d->mode);
+
+#if 0
         get_index(fp, (int *) &d->date);
+#endif
+        fread(datestr, 1, 20, fp);
+        sscanf(datestr,
+               "%d-%d-%dT%d:%d:%d",
+               &date.tm_year,
+               &date.tm_mon,
+               &date.tm_mday,
+               &date.tm_hour,
+               &date.tm_min,
+               &date.tm_sec);
+
+        /* Convert certain values to valid structure member values. */
+
+        date.tm_year -= 1900;
+        date.tm_mon  -= 1;
+
+        d->date = make_time_from_utc(&date);
 
         fread(d->player, 1, MAXNAM, fp);
 
-        fread(d->l_name, 1, MAXSTR, fp);
-        fread(d->l_ver, 1, MAXSTR, 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);
@@ -95,56 +143,40 @@ static int demo_header_read(FILE *fp, struct demo *d)
 
         fread(d->nb_version, 1, 20, fp);
 
-        d->level = search_level(d->l_name);
-
-        return d->level ? 1 : 0;
+        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;
-
-    if ((fp = fopen(filename, FMODE_RB)))
-    {
-        if (demo_header_read(fp, d))
-        {
-            char buf[MAXSTR];
-            char *basename;
-            int l;
+    static char buf[MAXSTR];
 
-            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';
+    l = strlen(buf) - strlen(suffix);
+    if ((l > 1) && (strcmp(buf + l, suffix) == 0))
+        buf[l] = '\0';
 
-            strncpy(d->name, buf, PATHMAX);
-            d->name[PATHMAX - 1] = '\0';
-
-            return fp;
-        }
-        fclose(fp);
-    }
-    return NULL;
+    return buf;
 }
 
 static void demo_header_write(FILE *fp, struct demo *d)
@@ -153,18 +185,29 @@ static void demo_header_write(FILE *fp, struct demo *d)
     int version = DEMO_VERSION;
     int zero  = 0;
 
+    char datestr[20];
+
+    strftime(datestr, 20, "%Y-%m-%dT%H:%M:%S", gmtime(&d->date));
+
     put_index(fp, &magic);
     put_index(fp, &version);
     put_index(fp, &zero);
     put_index(fp, &zero);
     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(d->l_name, 1, MAXSTR, fp);
-    fwrite(d->l_ver, 1, MAXSTR, 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);
@@ -197,9 +240,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);
     }
 }
@@ -264,8 +314,8 @@ const struct demo *demo_get(int i)
 const char *date_to_str(time_t i)
 {
     static char str[MAXSTR];
-    struct tm *tm = localtime(&i);
-    strftime(str, MAXSTR, "%c", tm);
+
+    strftime(str, MAXSTR, "%c", localtime(&i));
     return str;
 }
 
@@ -314,15 +364,16 @@ int demo_play_init(const char *name,
     strncpy(demo.filename, config_user(name), MAXSTR);
     strcat(demo.filename, REPLAY_EXT);
 
-    demo.level = level;
-
     demo.mode = lg->mode;
     demo.date = time(NULL);
 
     config_get_s(CONFIG_PLAYER, demo.player, MAXNAM);
 
-    strncpy(demo.l_name, level->levelname, MAXSTR);
-    strncpy(demo.l_ver, level->version, MAXSTR);
+    strncpy(demo.shot, level->shot, PATHMAX);
+    strncpy(demo.file, level->file, PATHMAX);
+    strncpy(demo.back, level->back, PATHMAX);
+    strncpy(demo.grad, level->grad, PATHMAX);
+    strncpy(demo.song, level->song, PATHMAX);
 
     demo.time  = lg->time;
     demo.goal  = lg->goal;
@@ -380,13 +431,29 @@ 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);
     }
 }
 
 /*---------------------------------------------------------------------------*/
 
+static int demo_load_level(const struct demo *demo, struct level *level)
+{
+    if (level_load(demo->file, level))
+    {
+        level->time = demo->time;
+        level->goal = demo->goal;
+        return 1;
+    }
+    return 0;
+}
+
 static struct demo  demo_replay;       /* The current demo */
+static struct level demo_level_replay; /* The current level demo-ed*/
 
 const struct demo *curr_demo_replay(void)
 {
@@ -397,10 +464,16 @@ 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;
+
         if (lg)
         {
             lg->mode = demo_replay.mode;
@@ -410,12 +483,12 @@ int demo_replay_init(const char *name, struct level_game *lg)
             lg->goal = demo_replay.goal;
 
             /* A normal replay demo */
-            audio_music_fade_to(0.5f, demo_replay.level->song);
-            return game_init(demo_replay.level, demo_replay.time,
+            audio_music_fade_to(0.5f, demo_replay.song);
+            return game_init(&demo_level_replay, demo_replay.time,
                              demo_replay.goal);
         }
         else /* A title screen demo */
-            return game_init(demo_replay.level, demo_replay.time, 0);
+            return game_init(&demo_level_replay, demo_replay.time, 0);
     }
     return 0;
 }