From 48a2e5ea9bbd5e3725c199bbacf074d0010eb62a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 4 Sep 2023 14:41:22 +0300 Subject: [PATCH 17/17] rscompat: Do not accept NoAggressive from 3.2 ruleset Only allow NoAggressive extra flag from 3.1 ruleset, never from 3.2 ruleset, even in compatibility mode. See osdn #48584 Signed-off-by: Marko Lindqvist --- server/ruleset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/ruleset.c b/server/ruleset.c index a96835341e..1d7be9f260 100644 --- a/server/ruleset.c +++ b/server/ruleset.c @@ -3891,7 +3891,8 @@ static bool load_ruleset_terrain(struct section_file *file, const char *sval = slist[j]; enum extra_flag_id flag; - if (compat->compat_mode && !fc_strcasecmp("NoAggressive", sval)) { + if (compat->compat_mode && compat->version < RSFORMAT_3_2 + && !fc_strcasecmp("NoAggressive", sval)) { if (pextra->no_aggr_near_city >= 0) { ruleset_error(NULL, LOG_ERROR, "\"%s\" extra \"%s\" has both no_aggr_near_city set and old style " -- 2.40.1