/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
#include <config.h>
-#include <fcntl.h>
#include <errno.h>
-#if defined(_WIN32)
-#include <direct.h>
-#include <io.h>
-#include "../lib/gen/getopt.h"
-#else
+#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
-#endif
-
#include "file.h"
+#include "game.h"
#include "land.h"
#include "misc.h"
#include "nat.h"
#include "trade.h"
#include "version.h"
-static void file_sct_init(coord, coord, struct sctstr *ptr,
- time_t timestamp);
+static void file_sct_init(coord, coord, struct sctstr *ptr);
static void
print_usage(char *program_name)
char buf[255];
char *filename;
int x, y;
+ struct gamestr game;
struct natstr nat;
struct realmstr realm;
struct sctstr sct;
int opt;
char *config_file = NULL;
int force = 0;
- time_t current_time = time(NULL);
while ((opt = getopt(argc, argv, "e:fhv")) != EOF) {
switch (opt) {
}
}
+ empfile_init();
if (emp_config(config_file) < 0)
exit(1);
+ empfile_fixup();
- ef_init();
-
- if (mkdir(gamedir, 0750) < 0 && errno != EEXIST) {
+ if (mkdir(gamedir, S_IRWXU | S_IRWXG) < 0 && errno != EEXIST) {
perror(gamedir);
printf("Can't make game directory\n");
exit(1);
exit(1);
}
}
+ memset(&game, 0, sizeof(game));
+ game.ef_type = EF_GAME;
+ game.game_turn = 1;
+ ef_write(EF_GAME, 0, &game);
memset(&nat, 0, sizeof(nat));
nat.ef_type = EF_NATION;
strcpy(nat.nat_cnam, "POGO");
memset(&nat, 0, sizeof(nat));
for (i = 1; i < MAXNOC; i++) {
nat.ef_type = EF_NATION;
- nat.nat_cnum = i;
+ nat.nat_cnum = nat.nat_uid = i;
putnat((&nat));
}
memset(&realm, 0, sizeof(realm));
for (j = 0; j < MAXNOR; j++) {
realm.r_realm = j;
realm.r_uid = (i * MAXNOR) + j;
- realm.r_timestamp = current_time;
putrealm(&realm);
}
}
- if (mkdir(teldir, 0750) < 0 && errno != EEXIST) {
+ if (mkdir(teldir, S_IRWXU | S_IRWXG) < 0 && errno != EEXIST) {
perror(teldir);
printf("Can't make telegram directory\n");
exit(1);
}
for (x = MAXNOC - 1; x >= 0; x--) {
filename = mailbox(buf, x);
- close(creat(filename, 0600));
+ close(creat(filename, S_IRWUG));
}
- close(creat(timestampfil, 0600));
- close(creat(annfil, 0600));
+ close(creat(annfil, S_IRWUG));
/* create a zero-filled sector file */
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 & 1), y, &sct, current_time);
+ file_sct_init(x * 2 + (y & 1), y, &sct);
putsect(&sct);
}
}
- map = calloc(WORLD_X * WORLD_Y / 2, sizeof(*map));
+ map = calloc(WORLD_SZ(), sizeof(*map));
for (i = 0; i < MAXNOC; i++) {
ef_write(EF_MAP, i, map);
}
}
static void
-file_sct_init(coord x, coord y, struct sctstr *ptr, time_t timestamp)
+file_sct_init(coord x, coord y, struct sctstr *ptr)
{
struct sctstr *sp = (struct sctstr *)ptr;
sp->ef_type = EF_SECTOR;
+ sp->sct_uid = XYOFFSET(x, y);
sp->sct_x = x;
sp->sct_y = y;
sp->sct_dist_x = x;
sp->sct_dist_y = y;
- sp->sct_timestamp = timestamp;
sp->sct_newtype = sp->sct_type = SCT_WATER;
sp->sct_coastal = 1;
}