From 72a33f7be0ab7ce9aa5cd9a95a61047b2810bc44 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 10 Apr 2021 10:29:53 +0300 Subject: [PATCH 53/53] Drop base flags rscompat code See osdn #41963 Signed-off-by: Marko Lindqvist --- server/ruleset.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/server/ruleset.c b/server/ruleset.c index 98aeb58617..7c84178506 100644 --- a/server/ruleset.c +++ b/server/ruleset.c @@ -3836,33 +3836,6 @@ static bool load_ruleset_terrain(struct section_file *file, "%s.vision_subs_sq", section); - if (compat->compat_mode) { - int bj; - const char **slist; - - slist = secfile_lookup_str_vec(file, &nval, "%s.flags", section); - for (bj = 0; bj < nval; bj++) { - const char *sval = slist[bj]; - - if (fc_strcasecmp("NoAggressive", sval)) { - ruleset_error(LOG_ERROR, "\"%s\" base \"%s\": unknown flag \"%s\".", - filename, - extra_rule_name(pextra), - sval); - ok = FALSE; - break; - } else { - if (!BV_ISSET(pextra->flags, EF_NOT_AGGRESSIVE)) { - /* We would not be adding extra to caused_by_list second time. */ - BV_SET(pextra->flags, EF_NOT_AGGRESSIVE); - extra_to_caused_by_list(pextra, EC_NOT_AGGRESSIVE); - } - } - } - - free(slist); - } - if (!ok) { break; } -- 2.30.2