forked from github/server
Probleme in stdbool.h führen zu nichtauswertung. unter GNUC wird für
'boolean' jetzt auch ein int verwendet, besser das.
This commit is contained in:
parent
905f5d6a0d
commit
a56dc25068
|
@ -846,7 +846,7 @@ read_alliances(FILE * F)
|
|||
#endif
|
||||
|
||||
int
|
||||
readgame(const char * filename, boolean backup)
|
||||
readgame(const char * filename, int backup)
|
||||
{
|
||||
int i, n, p;
|
||||
faction *f, **fp;
|
||||
|
|
|
@ -36,7 +36,7 @@ double version(void);
|
|||
FILE * cfopen(const char *filename, const char *mode);
|
||||
int readorders(const char *);
|
||||
int creategame(void);
|
||||
extern int readgame(const char * filename, boolean backup);
|
||||
extern int readgame(const char * filename, int backup);
|
||||
void writegame(const char *filename, char quiet);
|
||||
|
||||
extern void rsf(FILE * F, char *s, size_t len);
|
||||
|
|
|
@ -48,7 +48,8 @@
|
|||
#if defined(__GNUC__)
|
||||
# include <stdbool.h>
|
||||
# define HAS_BOOLEAN
|
||||
# define boolean bool
|
||||
typedef int boolean;
|
||||
/* # define boolean bool */
|
||||
#endif
|
||||
|
||||
#if defined(_DEBUG) && defined(_MSC_VER)
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#endif
|
||||
|
||||
#include <config.h>
|
||||
#include <eressea.h>
|
||||
#include "eressea.h"
|
||||
|
||||
#include "korrektur.h"
|
||||
|
||||
|
@ -706,8 +706,9 @@ main(int argc, char *argv[])
|
|||
return 0;
|
||||
#endif
|
||||
|
||||
sprintf(buf, "%d", turn);
|
||||
if ((i=readgame(buf, false))!=0) return i;
|
||||
sprintf(zText, "%d", turn);
|
||||
i=readgame(zText, false);
|
||||
if (i!=0) return i;
|
||||
|
||||
#ifdef NEW_STARTEQUIPMENT
|
||||
add_equipment(it_find("conquesttoken"), 1);
|
||||
|
|
Loading…
Reference in New Issue