From 595d9cffeadcb24f80d9c1e8ce89476baab3565f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 22 Apr 2022 00:25:36 +0300 Subject: [PATCH 29/29] rssanity: Do not skip enabler requirements check when ruleset is 3.1 one Even in compat (enabling) mode, do the full sanity check if the ruleset to load actually is 3.1 one. See osdn #44386 Signed-off-by: Marko Lindqvist --- server/rssanity.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/rssanity.c b/server/rssanity.c index 9dc6d748dd..3c002ca2fd 100644 --- a/server/rssanity.c +++ b/server/rssanity.c @@ -1254,7 +1254,8 @@ bool sanity_check_ruleset_data(struct rscompat_info *compat) } } requirement_vector_iterate_end; - if (compat == NULL || !compat->compat_mode) { + if (compat == NULL || !compat->compat_mode + || compat->version >= RSFORMAT_3_1) { /* Support for letting some of the following hard requirements be * implicit were retired in Freeciv 3.0. Others were retired later. * Make sure that the opposite of each hard action requirement -- 2.35.1