From 299ac9b2052c744940297fb210d7e604b36d3049 Mon Sep 17 00:00:00 2001 From: dark-ether Date: Sat, 12 Mar 2022 10:54:56 -0300 Subject: [PATCH 2/2] actions.h: added rule_name field to action struct server/savegame/savecompat.c: reverted change of action_list to action_group --- common/actions.h | 1 + server/savegame/savecompat.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/actions.h b/common/actions.h index ed6fa57260..10524d17da 100644 --- a/common/actions.h +++ b/common/actions.h @@ -406,6 +406,7 @@ struct action /* The name of the action shown in the UI */ char ui_name[MAX_LEN_NAME]; + char rule_name[MAX_LEN_NAME]; /* Suppress automatic help text generation about what enables and/or * disables this action. */ diff --git a/server/savegame/savecompat.c b/server/savegame/savecompat.c index a1380857e1..9b0eeb5326 100644 --- a/server/savegame/savecompat.c +++ b/server/savegame/savecompat.c @@ -1527,7 +1527,7 @@ static void compat_load_030100(struct loaddata *loading, plrno, unit); if ((action_unitstr = secfile_lookup_str_default(loading->file, "", - "player%d.u%d.action_group", + "player%d.u%d.action_list", plrno, unit))) { int order_num; @@ -2147,7 +2147,7 @@ static void compat_load_dev(struct loaddata *loading) plrno, unit); if ((action_unitstr = secfile_lookup_str_default(loading->file, "", - "player%d.u%d.action_group", + "player%d.u%d.action_list", plrno, unit))) { int order_num; -- 2.35.1