From 7d5bdb6cfde1f044e631392a2d537512a8503dc2 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 28 Jul 2024 16:05:11 +0300 Subject: [PATCH] rscompat: Update correct actions as Conquer City Shrink It was updating all the actions *except* Conquer City, now updates *only* those. See RM #766 Signed-off-by: Marko Lindqvist --- common/actions.c | 8 ++++---- server/ruleset/rscompat.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/common/actions.c b/common/actions.c index 1afc88eb99..5f98c298f7 100644 --- a/common/actions.c +++ b/common/actions.c @@ -7485,16 +7485,16 @@ bool action_ever_possible(action_id action) const char *gen_action_name_update_cb(const char *old_name) { if (is_ruleset_compat_mode()) { - if (fc_strcasecmp("Conquer City", old_name)) { + if (!fc_strcasecmp("Conquer City", old_name)) { return "Conquer City Shrink"; } - if (fc_strcasecmp("Conquer City 2", old_name)) { + if (!fc_strcasecmp("Conquer City 2", old_name)) { return "Conquer City Shrink 2"; } - if (fc_strcasecmp("Conquer City 3", old_name)) { + if (!fc_strcasecmp("Conquer City 3", old_name)) { return "Conquer City Shrink 3"; } - if (fc_strcasecmp("Conquer City 4", old_name)) { + if (!fc_strcasecmp("Conquer City 4", old_name)) { return "Conquer City Shrink 4"; } } diff --git a/server/ruleset/rscompat.c b/server/ruleset/rscompat.c index 095fb61bc1..ac8f7a5e5d 100644 --- a/server/ruleset/rscompat.c +++ b/server/ruleset/rscompat.c @@ -652,16 +652,16 @@ const char *rscompat_universal_name_3_3(const char *old_name) **************************************************************************/ const char *blocked_by_old_name_3_3(const char *new_name) { - if (fc_strcasecmp("conquer_city_shrink_blocked_by", new_name)) { + if (!fc_strcasecmp("conquer_city_shrink_blocked_by", new_name)) { return "conquer_city_blocked_by"; } - if (fc_strcasecmp("conquer_city_shrink_2_blocked_by", new_name)) { + if (!fc_strcasecmp("conquer_city_shrink_2_blocked_by", new_name)) { return "conquer_city_2_blocked_by"; } - if (fc_strcasecmp("conquer_city_shrink_3_blocked_by", new_name)) { + if (!fc_strcasecmp("conquer_city_shrink_3_blocked_by", new_name)) { return "conquer_city_3_blocked_by"; } - if (fc_strcasecmp("conquer_city_shrink_4_blocked_by", new_name)) { + if (!fc_strcasecmp("conquer_city_shrink_4_blocked_by", new_name)) { return "conquer_city_4_blocked_by"; } @@ -673,17 +673,17 @@ const char *blocked_by_old_name_3_3(const char *new_name) **************************************************************************/ const char *ui_name_old_name_3_3(const char *new_name) { - if (fc_strcasecmp("ui_name_conquer_city", new_name)) { - return "ui_name_conquer_city_shrink"; + if (!fc_strcasecmp("ui_name_conquer_city_shrink", new_name)) { + return "ui_name_conquer_city"; } - if (fc_strcasecmp("ui_name_conquer_city_2", new_name)) { - return "ui_name_conquer_city_shrink_2"; + if (!fc_strcasecmp("ui_name_conquer_city_shrink_2", new_name)) { + return "ui_name_conquer_city_2"; } - if (fc_strcasecmp("ui_name_conquer_city_3", new_name)) { - return "ui_name_conquer_city_shrink_3"; + if (!fc_strcasecmp("ui_name_conquer_city_shrink_3", new_name)) { + return "ui_name_conquer_city_3"; } - if (fc_strcasecmp("ui_name_conquer_city_4", new_name)) { - return "ui_name_conquer_city_shrink_4"; + if (!fc_strcasecmp("ui_name_conquer_city_shrink_4", new_name)) { + return "ui_name_conquer_city_4"; } return nullptr;