/*---------------------------------------------------------------------------*/
#define MAGIC 0x52424EAF
-#define DEMO_VERSION 1
+#define DEMO_VERSION 2
+
+#define DATELEN 20
static FILE *demo_fp;
{
printf("Name: %s\n"
"File: %s\n"
- "NB Version: %s\n"
"Time: %d\n"
"Coins: %d\n"
"Mode: %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);
}
+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 t;
struct tm date;
- char datestr[20];
+ char datestr[DATELEN];
get_index(fp, &magic);
get_index(fp, &version);
#if 0
get_index(fp, (int *) &d->date);
#endif
- fread(datestr, 1, 20, fp);
+ fread(datestr, 1, DATELEN, fp);
sscanf(datestr,
"%d-%d-%dT%d:%d:%d",
&date.tm_year,
&date.tm_min,
&date.tm_sec);
- /* Convert some values to valid structure member values. */
+ /* Convert certain values to valid structure member values. */
date.tm_year -= 1900;
date.tm_mon -= 1;
- d->date = mktime(&date);
+ d->date = make_time_from_utc(&date);
fread(d->player, 1, MAXNAM, fp);
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;
+ char *base;
+ size_t l;
- strncpy(d->filename, filename, MAXSTR);
+ /* 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)
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);
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(datestr, 1, DATELEN, fp);
fwrite(d->player, 1, MAXNAM, fp);
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. */
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);
}
}
const char *date_to_str(time_t i)
{
static char str[MAXSTR];
- struct tm local, *utc;
-
- /* Replay date/time is stored as UTC. The code below computes the actual
- * local time. Needless to say, this is an ugly hack...
- */
-
-
- local = *localtime(&i);
- utc = gmtime(&i);
-
- 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 ;
-
- strftime(str, MAXSTR, "%c", &local);
+ strftime(str, MAXSTR, "%c", localtime(&i));
return str;
}
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);
strncpy(dst, config_user(name), PATHMAX);
strcat(dst, REPLAY_EXT);
+#ifdef _WIN32
+ if (demo_exists(name))
+ remove(dst);
+#endif
rename(src, dst);
}
}
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;
projects / neverball / blobdiff