Skip to content

Commit

Permalink
rscompat: Update correct actions as Conquer City Shrink
Browse files Browse the repository at this point in the history
It was updating all the actions *except* Conquer City, now
updates *only* those.

See RM #766

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
  • Loading branch information
cazfi committed Jul 28, 2024
1 parent c570727 commit 7d5bdb6
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions common/actions.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}
Expand Down
24 changes: 12 additions & 12 deletions server/ruleset/rscompat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

Expand All @@ -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;
Expand Down

0 comments on commit 7d5bdb6

Please sign in to comment.