Missed this one. Remove check for custom coin values. Items take care of this.
[neverball] / ball / demo.c
index 0844b89..bb20013 100644 (file)
@@ -1,4 +1,4 @@
-/*   
+/*
  * Copyright (C) 2003 Robert Kooima
  *
  * NEVERBALL is  free software; you can redistribute  it and/or modify
 #include <string.h>
 #include <time.h>
 
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-
 #include "demo.h"
 #include "game.h"
 #include "audio.h"
 
 /*---------------------------------------------------------------------------*/
 
-#define MAGIC     0x4E425251 /* Replay file magic number (should not change) */
-#define OLD_MAGIC 0x4E425250 /* Replay file magic number for neverball 1.4.0 */
-#define REPLAY_VERSION  1    /* Replay file format version (can change)      */
-
-#define DEMO_FPS_CAP 200 /* FPS replay limit, keeps size down on monster systems */
+#define MAGIC           0x52424EAF
+#define DEMO_VERSION    1
 
 static FILE *demo_fp;
 
-static struct demo demos[MAXDEMO]; /* Array of scanned demos */
-
-static int count; /* number of scanned demos */
+static struct demo demos[MAXDEMO]; /* Array of scanned demos  */
+static int         count;          /* Number of scanned demos */
 
 /*---------------------------------------------------------------------------*/
 
-void demo_dump_info(const struct demo * d)
-/* This function dump the info of a demo structure
- * It's only a function for debugging, no need of I18N */
+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"
-          "State:        %d\n"
-          "Date:         %s"
-          "Player:       %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"
-          "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,
-          d->time, d->goal, d->score, d->balls, d->times);
+           "File:         %s\n"
+           "NB Version:   %s\n"
+           "Time:         %d\n"
+           "Coins:        %d\n"
+           "Mode:         %d\n"
+           "State:        %d\n"
+           "Date:         %s"
+           "Player:       %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"
+           "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,
+           d->time, d->goal, d->score, d->balls, d->times);
 }
 
-FILE * demo_header_read(const char * filename, struct demo * d)
-/* Open a demo file, fill the demo information structure
- * If success, return the file pointer positioned after the header
- * If fail, return null 
- */
+static int demo_header_read(FILE *fp, struct demo *d)
+{
+    int magic;
+    int version;
+    int t;
+
+    get_index(fp, &magic);
+    get_index(fp, &version);
+
+    get_index(fp, &t);
+
+    if (magic == MAGIC && version == DEMO_VERSION && t)
+    {
+        d->timer = t;
+
+        get_index(fp, &d->coins);
+        get_index(fp, &d->state);
+        get_index(fp, &d->mode);
+        get_index(fp, (int *) &d->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);
+        get_index(fp, &d->score);
+        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)
 {
     FILE *fp;
-    char *basename;
-    char buf[MAXSTR];
-    
+
     if ((fp = fopen(filename, FMODE_RB)))
     {
-       int magic;
-       int version;
-       int t;
-
-       get_index(fp, &magic);
-       get_index(fp, &version);
-       get_index(fp, &t);  /* if time is 0, it's mean the replay wat not finished */
-
-       if (magic == MAGIC && version == REPLAY_VERSION && t)
-       {
-           d->timer = t;
-           strncpy(d->filename, filename, PATHMAX);
-           
-           /* Remove the directory delimiter */
+        if (demo_header_read(fp, d))
+        {
+            char buf[MAXSTR];
+            char *basename;
+            int l;
+
+            strncpy(d->filename, filename, MAXSTR);
+
+            /* Remove the directory delimiter */
+
+            basename = strrchr(filename, '/');
 #ifdef _WIN32
-           basename = strrchr(filename, '\\');
-#else
-           basename = strrchr(filename, '/');
+            if (!basename)
+                basename = strrchr(filename, '\\');
+            else
+            {
+                char *tmp;
+                if ((tmp = strrchr(basename, '\\')))
+                    basename = tmp;
+            }
 #endif
-           
-           if (basename != NULL)
-               strncpy(buf, basename+1, MAXSTR);
-           else
-               strncpy(buf, filename, MAXSTR);
-           
-           /* Remove the extension */
-           t = strlen(buf) - strlen(REPLAY_EXT);
-           if ((t > 1) && (strcmp(buf+t, REPLAY_EXT) == 0))
-               buf[t] = '\0';
-           strncpy(d->name, buf, PATHMAX);
-           d->name[PATHMAX-1]= '\0';
-           
-           get_index (fp, &d->coins);
-           get_index (fp, &d->state);
-           get_index (fp, &d->mode);
-           get_index (fp, (int*)&d->date);
-           get_string(fp, d->player, MAXNAM);
-           get_string(fp, d->shot,   PATHMAX);
-           get_string(fp, d->file,   PATHMAX);
-           get_string(fp, d->back,   PATHMAX);
-           get_string(fp, d->grad,   PATHMAX);
-           get_string(fp, d->song,   PATHMAX);
-            get_index (fp, &d->time);
-            get_index (fp, &d->goal);
-            get_index (fp, &d->score);
-            get_index (fp, &d->balls);
-            get_index (fp, &d->times);
-           get_string(fp, d->nb_version, 20);
-
-           return fp;
-       }
-       fclose(fp);
+            strncpy(buf, basename ? basename + 1 : filename, MAXSTR);
+
+            /* 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';
+
+            return fp;
+        }
+        fclose(fp);
     }
     return NULL;
 }
 
-static FILE * demo_header_write(struct demo * d)
-/* Create a new demo file, write the demo information structure
- * If success, return the file pointer positioned after the header
- * If fail, return null
- * */
+static void demo_header_write(FILE *fp, struct demo *d)
 {
     int magic = MAGIC;
-    int version = REPLAY_VERSION;
+    int version = DEMO_VERSION;
     int zero  = 0;
-    FILE *fp;
-    
-    if (d->filename && (fp = fopen(d->filename, FMODE_WB)))
-    {
-        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);
-       put_index (fp, (int*)&d->date);
-       put_string(fp, d->player);
-       put_string(fp, d->shot);
-       put_string(fp, d->file);
-       put_string(fp, d->back);
-       put_string(fp, d->grad);
-       put_string(fp, d->song);
-        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);
-       put_string(fp, VERSION);
-
-        return fp;
-    }
-    return NULL;
+
+    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);
+    put_index(fp, (int *) &d->date);
+
+    fwrite(d->player, 1, MAXNAM, 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);
 }
 
-void demo_header_stop(FILE * fp, int coins, int timer, int state)
-    /* Update the demo header using the final level state. */
+/* Update the demo header using the final level state. */
+
+void demo_header_stop(FILE *fp, int coins, int timer, int state)
 {
     long pos = ftell(fp);
+
     fseek(fp, 8, SEEK_SET);
     put_index(fp, &timer);
     put_index(fp, &coins);
     put_index(fp, &state);
     fseek(fp, pos, SEEK_SET);
 }
-       
+
 /*---------------------------------------------------------------------------*/
 
-static void demo_scan_file(const char * filename)
-/* Scan a other file (used by demo_scan */
+/* Scan another file (used by demo_scan). */
+
+static void demo_scan_file(const char *filename)
 {
     FILE *fp;
-    if ((fp = demo_header_read(config_user(filename), &demos[count])))
+    struct demo *d = &demos[count];
+
+    if ((fp = demo_header_open(config_user(filename), d)))
     {
-       count++;
-       fclose(fp);
+        count++;
+        fclose(fp);
     }
 }
 
@@ -219,7 +225,7 @@ int demo_scan(void)
     if ((h = FindFirstFile(config_user("*"), &d)) != INVALID_HANDLE_VALUE)
     {
         do
-           demo_scan_file(d.cFileName);
+            demo_scan_file(d.cFileName);
         while (count < MAXDEMO && FindNextFile(h, &d));
 
         FindClose(h);
@@ -242,7 +248,7 @@ int demo_scan(void)
     if ((dp = opendir(config_user(""))))
     {
         while (count < MAXDEMO && (ent = readdir(dp)))
-           demo_scan_file(ent->d_name);
+            demo_scan_file(ent->d_name);
 
         closedir(dp);
     }
@@ -257,16 +263,16 @@ const char *demo_pick(void)
     return (n > 0) ? demos[(rand() >> 4) % n].filename : NULL;
 }
 
-const struct demo *get_demo(int i)
+const struct demo *demo_get(int i)
 {
     return (0 <= i && i < count) ? &demos[i] : NULL;
 }
 
-const char * date_to_str(time_t i)
+const char *date_to_str(time_t i)
 {
     static char str[MAXSTR];
-    struct tm * tm = localtime(&i);
-    strftime (str, MAXSTR, "%c", tm);
+    struct tm *tm = localtime(&i);
+    strftime(str, MAXSTR, "%c", tm);
     return str;
 }
 
@@ -305,65 +311,62 @@ void demo_unique(char *name)
 /*---------------------------------------------------------------------------*/
 
 int demo_play_init(const char *name,
-                  const struct level * level,
-                  const struct level_game * lg)
+                   const struct level *level,
+                   const struct level_game *lg)
 {
     struct demo demo;
 
-    /* file structure */
-    strncpy(demo.name, name, MAXNAM);
-    strncpy(demo.filename, config_user(name), PATHMAX);
+    memset(&demo, 0, sizeof (demo));
+
+    strncpy(demo.filename, config_user(name), MAXSTR);
     strcat(demo.filename, REPLAY_EXT);
-    demo.time = demo.coins = demo.state = 0;
+
     demo.mode = lg->mode;
     demo.date = time(NULL);
+
     config_get_s(CONFIG_PLAYER, demo.player, MAXNAM);
+
     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;
     demo.score = lg->score;
     demo.balls = lg->balls;
     demo.times = lg->times;
 
-    demo_fp = demo_header_write(&demo);
-    if (demo_fp == NULL)
-       return 0;
-    else
+    strncpy(demo.nb_version, VERSION, 20);
+
+    if (demo.filename && (demo_fp = fopen(demo.filename, FMODE_WB)))
     {
+        demo_header_write(demo_fp, &demo);
         audio_music_fade_to(2.0f, level->song);
         return game_init(level, lg->time, lg->goal);
     }
+    return 0;
 }
 
 void demo_play_step(float dt)
 {
-    static float fps_track = 0.0f;
-    static float fps_cap   = 1.0f / (float) DEMO_FPS_CAP;
-
     if (demo_fp)
     {
-        fps_track += dt;
-        if (fps_track > fps_cap)
-        {            
-            put_float(demo_fp, &fps_track);
-            put_game_state(demo_fp); 
-            fps_track = 0.0f;
-        }
+        put_float(demo_fp, &dt);
+        put_game_state(demo_fp);
     }
 }
 
-void demo_play_stop(const struct level_game *lg)
 /* Update the demo header using the final level state. */
+
+void demo_play_stop(const struct level_game *lg)
 {
     if (demo_fp)
     {
         demo_header_stop(demo_fp, lg->coins, lg->timer, lg->state);
-       fclose(demo_fp);
-       demo_fp = NULL;
+        fclose(demo_fp);
+        demo_fp = NULL;
     }
 }
 
@@ -377,64 +380,66 @@ void demo_play_save(const char *name)
     char src[PATHMAX];
     char dst[PATHMAX];
 
-    if (name && demo_exists(USER_REPLAY_FILE) && strcmp(name, USER_REPLAY_FILE) != 0)
+    if (name && demo_exists(USER_REPLAY_FILE)
+        && strcmp(name, USER_REPLAY_FILE) != 0)
     {
         strncpy(src, config_user(USER_REPLAY_FILE), PATHMAX);
-       strcat(src, REPLAY_EXT);
-       strncpy(dst, config_user(name),             PATHMAX);
-       strcat(dst, REPLAY_EXT);
+        strcat(src, REPLAY_EXT);
+        strncpy(dst, config_user(name), PATHMAX);
+        strcat(dst, REPLAY_EXT);
 
-       rename(src, dst);
+        rename(src, dst);
     }
 }
 
 /*---------------------------------------------------------------------------*/
 
-static int demo_load_level(const struct demo * demo, struct level * level)
-/* Load the level of the demo and fill the level structure */
+static int demo_load_level(const struct demo *demo, struct level *level)
 {
-    strcpy(level->file, demo->file);
-    strcpy(level->back, demo->back);
-    strcpy(level->grad, demo->grad);
-    strcpy(level->shot, demo->shot);
-    strcpy(level->song, demo->song);
-    level->time = demo->time;
-    level->goal = demo->goal;
-    return 1;
+    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)
+const struct demo *curr_demo_replay(void)
 {
     return &demo_replay;
 }
 
+/* Internally load a replay and fill the lg structure (if not NULL) */
 
 int demo_replay_init(const char *name, struct level_game *lg)
-/* Internally load a replay an fill the lg structure (if not NULL) */
 {
-    if ((demo_fp = demo_header_read(name, &demo_replay)))
+    demo_fp = demo_header_open(name, &demo_replay);
+
+    if (demo_fp)
     {
-       demo_load_level(&demo_replay, &demo_level_replay);
-       
-       if (lg)
-       {
-           lg->mode       = demo_replay.mode;
-           lg->score      = demo_replay.score;
-           lg->times      = demo_replay.times;
-           lg->time       = demo_replay.time;
-           lg->goal       = demo_replay.goal;
-           
-           /* A normal replay demo */
-           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_level_replay, demo_replay.time, 0);
+        if (!demo_load_level(&demo_replay, &demo_level_replay))
+            return 0;
+
+        if (lg)
+        {
+            lg->mode = demo_replay.mode;
+            lg->score = demo_replay.score;
+            lg->times = demo_replay.times;
+            lg->time = demo_replay.time;
+            lg->goal = demo_replay.goal;
+
+            /* A normal replay demo */
+            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_level_replay, demo_replay.time, 0);
     }
-    
     return 0;
 }
 
@@ -454,7 +459,7 @@ int demo_replay_step(float *dt)
             game_step(g, *dt, &sv);
 
             /* Load real current game state from file. */
-            
+
             if (get_game_state(demo_fp))
                 return 1;
         }
@@ -469,7 +474,7 @@ void demo_replay_stop(int d)
         fclose(demo_fp);
         demo_fp = NULL;
 
-        if (d) unlink(demo_replay.filename);
+        if (d) remove(demo_replay.filename);
     }
 }