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

fix a FIXME: include gamedata.h directly, not through save.h

This commit is contained in:
Enno Rehling 2016-04-09 18:22:20 +02:00
parent 4dc9b737de
commit 01ecc72f2d
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bind_storage.c
View File

@ -17,6 +17,7 @@ without prior permission by the authors of Eressea.
#include <kernel/save.h> #include <kernel/save.h>
#include <kernel/version.h> #include <kernel/version.h>
#include <util/gamedata.h>
#include <util/log.h> #include <util/log.h>
#include <storage.h> #include <storage.h>

1
src/kernel/building.c
View File

@ -39,6 +39,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <util/bsdstring.h> #include <util/bsdstring.h>
#include <util/event.h> #include <util/event.h>
#include <util/functions.h> #include <util/functions.h>
#include <util/gamedata.h>
#include <util/language.h> #include <util/language.h>
#include <util/log.h> #include <util/log.h>
#include <quicklist.h> #include <quicklist.h>

1
src/kernel/faction.c
View File

@ -40,6 +40,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <util/base36.h> #include <util/base36.h>
#include <util/bsdstring.h> #include <util/bsdstring.h>
#include <util/event.h> #include <util/event.h>
#include <util/gamedata.h>
#include <util/goodies.h> #include <util/goodies.h>
#include <util/lists.h> #include <util/lists.h>
#include <util/language.h> #include <util/language.h>

5
src/kernel/save.h
View File

@ -20,7 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define H_KRNL_SAVE #define H_KRNL_SAVE
#include <stream.h> #include <stream.h>
#include <util/gamedata.h> // FIXME: eliminate include dependency from this file
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -78,8 +77,8 @@ extern "C" {
void create_backup(char *file); void create_backup(char *file);
int write_game(gamedata *data); int write_game(struct gamedata *data);
int read_game(gamedata *data); int read_game(struct gamedata *data);
/* test-only functions that give access to internal implementation details (BAD) */ /* test-only functions that give access to internal implementation details (BAD) */
void _test_write_password(struct gamedata *data, const struct faction *f); void _test_write_password(struct gamedata *data, const struct faction *f);