From e06e11d4b1541179573aef9b5830cf7544679946 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 16 Apr 2021 06:16:45 +0300 Subject: [PATCH 57/57] Drop remaining fragments of auto_attack.will_never rscompat code See osdn #42013 Signed-off-by: Marko Lindqvist --- server/ruleset.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/server/ruleset.c b/server/ruleset.c index e0d368ab71..8f892bb05b 100644 --- a/server/ruleset.c +++ b/server/ruleset.c @@ -6669,39 +6669,13 @@ static bool load_ruleset_game(struct section_file *file, bool act, filename, "auto_attack", "attack_actions"); ok = FALSE; } - - if (compat->compat_mode) { - enum unit_type_flag_id *protecor_flag; - size_t psize; - - if (secfile_entry_lookup(file, "%s", "auto_attack.will_never")) { - protecor_flag = - secfile_lookup_enum_vec(file, &psize, unit_type_flag_id, - "%s", "auto_attack.will_never"); - - if (!protecor_flag) { - /* Entity exists but couldn't read it. */ - ruleset_error(LOG_ERROR, - "\"%s\": %s: bad unit type flag list.", - filename, "auto_attack.will_never"); - - ok = FALSE; - } - } else { - psize = 0; - protecor_flag = NULL; - } - - if (psize) { - FC_FREE(protecor_flag); - } - } } /* section: actions */ if (ok) { action_iterate(act_id) { struct action *paction = action_by_number(act_id); + if (!load_action_blocked_by_list(file, filename, paction)) { ok = FALSE; } -- 2.30.2