From 74d583461e17409c9bc564a1c90460062ea240c2 Mon Sep 17 00:00:00 2001 From: CTD Date: Thu, 1 Oct 2015 15:48:31 +0200 Subject: [PATCH 1/6] update submodule iniparser --- iniparser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iniparser b/iniparser index ecf956b98..5b96eac07 160000 --- a/iniparser +++ b/iniparser @@ -1 +1 @@ -Subproject commit ecf956b9808c28c2db52e6b73930f57876dbb258 +Subproject commit 5b96eac07a88a215c616b0ae90d9ae6e3ed179b1 From 766a7a18b772a9bbd308b1ead35edc6ee9900278 Mon Sep 17 00:00:00 2001 From: CTD Date: Thu, 1 Oct 2015 16:23:38 +0200 Subject: [PATCH 2/6] Finaly the latest iniparser! --- iniparser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iniparser b/iniparser index 5b96eac07..0113679ff 160000 --- a/iniparser +++ b/iniparser @@ -1 +1 @@ -Subproject commit 5b96eac07a88a215c616b0ae90d9ae6e3ed179b1 +Subproject commit 0113679ffbbcd464a319395adee18af3682e3a39 From d124c02fb646f9cdc4911032f0923fd8a71c6d43 Mon Sep 17 00:00:00 2001 From: CTD Date: Thu, 1 Oct 2015 16:31:01 +0200 Subject: [PATCH 3/6] Another iniparser try --- iniparser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iniparser b/iniparser index 0113679ff..d4e6e4c89 160000 --- a/iniparser +++ b/iniparser @@ -1 +1 @@ -Subproject commit 0113679ffbbcd464a319395adee18af3682e3a39 +Subproject commit d4e6e4c89c43ddcb82c2e87f45669be8d5105441 From 6916694341b35a1ce4aa8f0b91efcb2c306b92e4 Mon Sep 17 00:00:00 2001 From: CTD Date: Thu, 1 Oct 2015 17:09:13 +0200 Subject: [PATCH 4/6] Hopfully the last iniparser --- iniparser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iniparser b/iniparser index d4e6e4c89..ecf956b98 160000 --- a/iniparser +++ b/iniparser @@ -1 +1 @@ -Subproject commit d4e6e4c89c43ddcb82c2e87f45669be8d5105441 +Subproject commit ecf956b9808c28c2db52e6b73930f57876dbb258 From 65eab060a09a3d63b62226d640bbb46ef2378be2 Mon Sep 17 00:00:00 2001 From: CTD Date: Tue, 12 Jul 2016 13:24:17 +0200 Subject: [PATCH 5/6] 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); From f324408b6f0d43db6ab558f0f18b76eea4eb87ac Mon Sep 17 00:00:00 2001 From: CTD Date: Fri, 15 Jul 2016 10:48:37 +0200 Subject: [PATCH 6/6] 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);