- fix warning

- initialize global.cookie properly
This commit is contained in:
Enno Rehling 2008-05-22 21:56:55 +00:00
parent 88ce120991
commit 3391b3bb7a
4 changed files with 5 additions and 8 deletions

View File

@ -92,7 +92,10 @@
/* exported variables */
region *regions;
faction *factions;
settings global = { 0 };
struct settings global = {
"Eressea", /* gamename */
1000, /* maxunits */
};
FILE *logfile;
FILE *updatelog;
const struct race * new_race[MAXRACES];

View File

@ -369,7 +369,6 @@ extern const struct race * new_race[];
/* globale settings des Spieles */
typedef struct settings {
int cookie;
const char *gamename;
boolean unitsperalliance;
unsigned int maxunits;
@ -379,6 +378,7 @@ typedef struct settings {
struct param * parameters;
void * vm_state;
float producexpchance;
int cookie;
struct global_functions {
int (*wage)(const struct region *r, const struct faction * f, const struct race * rc);

View File

@ -884,7 +884,6 @@ fix_groups(void)
void
korrektur(void)
{
int i = rng_int();
#if GLOBAL_WARMING
gamedate date;
get_gamedate(turn, &date);

View File

@ -160,11 +160,6 @@ static const char * luafile = NULL;
static const char * script_path = "scripts";
static int memdebug = 0;
struct settings global = {
"Eressea", /* gamename */
1000, /* maxunits */
};
#if defined(HAVE_SIGACTION) && defined(HAVE_EXECINFO)
#include <execinfo.h>
#include <signal.h>