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

fix vs bool - int conversion warning

This commit is contained in:
CTD 2016-07-12 13:24:17 +02:00
parent c63b8a2028
commit 65eab060a0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/config.c
View File

@ -1057,7 +1057,7 @@ int rule_give(void)
return config_get_int("rules.give.flags", GIVE_DEFAULT); return config_get_int("rules.give.flags", GIVE_DEFAULT);
} }
bool markets_module(void) int markets_module(void)
{ {
return config_get_int("modules.markets", 0); return config_get_int("modules.markets", 0);
} }

2
src/kernel/config.h
View File

@ -135,7 +135,7 @@ struct param;
#define GUARD_ALL 0xFFFF #define GUARD_ALL 0xFFFF
int maxworkingpeasants(const struct region *r); int maxworkingpeasants(const struct region *r);
bool markets_module(void); int markets_module(void);
int wage(const struct region *r, const struct faction *f, int wage(const struct region *r, const struct faction *f,
const struct race *rc, int in_turn); const struct race *rc, int in_turn);