From f324408b6f0d43db6ab558f0f18b76eea4eb87ac Mon Sep 17 00:00:00 2001 From: CTD Date: Fri, 15 Jul 2016 10:48:37 +0200 Subject: [PATCH] Fix bool - int conversion the other way --- src/kernel/config.c | 4 ++-- src/kernel/config.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kernel/config.c b/src/kernel/config.c index 0751c31c2..96ac6d3c6 100644 --- a/src/kernel/config.c +++ b/src/kernel/config.c @@ -1057,9 +1057,9 @@ int rule_give(void) return config_get_int("rules.give.flags", GIVE_DEFAULT); } -int markets_module(void) +bool markets_module(void) { - return config_get_int("modules.markets", 0); + return (bool)config_get_int("modules.markets", 0); } static struct param *configuration; diff --git a/src/kernel/config.h b/src/kernel/config.h index a4a881ce1..dda7873aa 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); - int markets_module(void); + bool markets_module(void); int wage(const struct region *r, const struct faction *f, const struct race *rc, int in_turn);