COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / util / files.c

diff --git a/src/util/files.c b/src/util/files.c
index 10a3486f554850745e41d243820af8e1c0369fd7..0f495e720462ba6fcaa4d64dc13c5ef1fb489f62 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -33,6 +33,8 @@
  *     Steve McClure, 1998
  */
 
+#include <config.h>
+
 #include <sys/types.h>
 #include <fcntl.h>
 #if !defined(_WIN32)
@@ -46,7 +48,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "options.h"
 #include "misc.h"
 #include "sect.h"
 #include "nat.h"
@@ -61,7 +62,8 @@
 #include "prototypes.h"
 #include "optlist.h"
 
-static void file_sct_init(coord x, coord y, s_char *ptr);
+static void file_sct_init(coord x, coord y, s_char *ptr,
+                         time_t timestamp);
 
 static void
 print_usage(char *program_name)
@@ -77,12 +79,14 @@ main(int argc, char *argv[])
     s_char *filename;
     int x, y;
     struct natstr nat;
+    struct realmstr realm;
     struct sctstr sct;
-    int i;
+    int i, j;
     s_char *map;
     int opt;
     char *config_file = NULL;
     int force = 0;
+    time_t current_time = time(NULL);
 
     while ((opt = getopt(argc, argv, "e:f")) != EOF) {
        switch (opt) {
@@ -101,8 +105,7 @@ main(int argc, char *argv[])
     if (emp_config(config_file) < 0)
        exit(1);
 
-    empfile[EF_MAP].size = (WORLD_X * WORLD_Y) / 2;
-    empfile[EF_BMAP].size = (WORLD_X * WORLD_Y) / 2;
+    ef_init();
 
     if (access(datadir, F_OK) < 0 && mkdir(datadir, 0750) < 0) {
        perror(datadir);
@@ -118,23 +121,23 @@ main(int argc, char *argv[])
        printf("WARNING: this blasts the existing game in %s (if any)\n",
           datadir);
        printf("continue? ");
-       fgets(buf, sizeof(buf) - 1, stdin);
+       fgets(buf, sizeof(buf), stdin);
        if (*buf != 'y' && *buf != 'Y')
            exit(1);
     }
     for (i = 0; i < EF_MAX; i++) {
-       if (ef_open(i, O_RDWR | O_CREAT | O_TRUNC, 0) < 0) {
+       if (!EF_IS_GAME_STATE(i))
+           continue;
+       if (!ef_open(i, EFF_CREATE)) {
            perror("ef_open");
            exit(1);
        }
     }
     memset(&nat, 0, sizeof(nat));
     nat.ef_type = EF_NATION;
-    if (nat.nat_cnam[0] == 0)
-       strcpy(nat.nat_cnam, "POGO");
-    if (nat.nat_pnam[0] == 0)
-       strcpy(nat.nat_pnam, "peter");
-    nat.nat_stat = STAT_INUSE | STAT_NORM | STAT_GOD | STAT_ABS;
+    strcpy(nat.nat_cnam, "POGO");
+    strcpy(nat.nat_pnam, "peter");
+    nat.nat_stat = STAT_GOD;
     nat.nat_btu = 255;
     nat.nat_money = 123456789;
     nat.nat_cnum = 0;
@@ -149,7 +152,17 @@ main(int argc, char *argv[])
        nat.nat_cnum = i;
        putnat((&nat));
     }
-    ef_close(EF_NATION);
+    memset(&realm, 0, sizeof(realm));
+    realm.ef_type = EF_REALM;
+    for (i = 0; i < MAXNOC; i++) {
+       realm.r_cnum = i;
+       for (j = 0; j < MAXNOR; j++) {
+           realm.r_realm = j;
+           realm.r_uid = (i * MAXNOR) + j;
+           realm.r_timestamp = current_time;
+           putrealm(&realm);
+       }
+    }
     if (access(teldir, F_OK) < 0 && mkdir(teldir, 0750) < 0) {
        perror(teldir);
        printf("Can't make telegram directory\n");
@@ -170,19 +183,22 @@ main(int argc, char *argv[])
     memset(&sct, 0, sizeof(sct));
     for (y = 0; y < WORLD_Y; y++) {
        for (x = 0; x < WORLD_X / 2; x++) {
-           file_sct_init(x * 2 + (y & 01), y, (s_char *)&sct);
+           file_sct_init(x * 2 + (y & 01), y, (s_char *)&sct,
+               current_time);
            putsect(&sct);
        }
     }
-    map = (s_char *)calloc(WORLD_X * WORLD_Y / 2, sizeof(*map));
+    map = calloc(WORLD_X * WORLD_Y / 2, sizeof(*map));
     for (i = 0; i < MAXNOC; i++) {
        ef_write(EF_MAP, i, map);
     }
-    map = (s_char *)calloc(WORLD_X * WORLD_Y / 2, sizeof(*map));
+    map = calloc(WORLD_X * WORLD_Y / 2, sizeof(*map));
     for (i = 0; i < MAXNOC; i++) {
        ef_write(EF_BMAP, i, map);
     }
     for (i = 0; i < EF_MAX; i++) {
+       if (!EF_IS_GAME_STATE(i))
+           continue;
        ef_close(i);
     }
 
@@ -190,7 +206,7 @@ main(int argc, char *argv[])
 }
 
 static void
-file_sct_init(coord x, coord y, s_char *ptr)
+file_sct_init(coord x, coord y, s_char *ptr, time_t timestamp)
 {
     struct sctstr *sp = (struct sctstr *)ptr;
 
@@ -199,19 +215,7 @@ file_sct_init(coord x, coord y, s_char *ptr)
     sp->sct_y = y;
     sp->sct_dist_x = x;
     sp->sct_dist_y = y;
-}
-
-void
-logerror(s_char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    vfprintf(stderr, format, ap);
-    va_end(ap);
-}
-
-void
-log_last_commands(void)
-{
+    sp->sct_timestamp = timestamp;
+    sp->sct_newtype = sp->sct_type = SCT_WATER;
+    sp->sct_coastal = 1;
 }