Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/kernel/eressea.c
View File

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

2
src/common/kernel/eressea.h
View File

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

1
src/eressea/korrektur.c
View File

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

5
src/eressea/server.cpp
View File

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