From 65eab060a09a3d63b62226d640bbb46ef2378be2 Mon Sep 17 00:00:00 2001 From: CTD Date: Tue, 12 Jul 2016 13:24:17 +0200 Subject: [PATCH] fix vs bool - int conversion warning --- src/kernel/config.c | 2 +- src/kernel/config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel/config.c b/src/kernel/config.c index 64afd98d3..0751c31c2 100644 --- a/src/kernel/config.c +++ b/src/kernel/config.c @@ -1057,7 +1057,7 @@ int rule_give(void) return config_get_int("rules.give.flags", GIVE_DEFAULT); } -bool markets_module(void) +int markets_module(void) { return config_get_int("modules.markets", 0); } diff --git a/src/kernel/config.h b/src/kernel/config.h index dda7873aa..a4a881ce1 100644 --- a/src/kernel/config.h +++ b/src/kernel/config.h @@ -135,7 +135,7 @@ struct param; #define GUARD_ALL 0xFFFF int maxworkingpeasants(const struct region *r); - bool markets_module(void); + int markets_module(void); int wage(const struct region *r, const struct faction *f, const struct race *rc, int in_turn);