diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index ce85776b8..8b6b88949 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -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]; diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h index 32c326566..091a4b695 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/eressea.h @@ -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); diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index bca842e25..b0d6f3251 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -884,7 +884,6 @@ fix_groups(void) void korrektur(void) { - int i = rng_int(); #if GLOBAL_WARMING gamedate date; get_gamedate(turn, &date); diff --git a/src/eressea/server.cpp b/src/eressea/server.cpp index c1f8aa0d9..14405f326 100644 --- a/src/eressea/server.cpp +++ b/src/eressea/server.cpp @@ -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 #include