From 7a371c156b0c04dd1ba002509407566b0539a289 Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Thu, 9 Feb 2017 17:21:08 -0500 Subject: [PATCH 1/2] WML: Have[store_side] use .__cfg from wesnoth.sides --- data/lua/wml-tags.lua | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/data/lua/wml-tags.lua b/data/lua/wml-tags.lua index 219ed9770bbc..c6fad3054ce6 100644 --- a/data/lua/wml-tags.lua +++ b/data/lua/wml-tags.lua @@ -666,24 +666,10 @@ end function wml_actions.store_side(cfg) local writer = utils.vwriter.init(cfg, "side") for t, side_number in helper.get_sides(cfg) do - local container = { - controller = t.controller, - recruit = table.concat(t.recruit, ","), - fog = t.fog, - shroud = t.shroud, - hidden = t.hidden, - income = t.total_income, - village_gold = t.village_gold, - village_support = t.village_support, - team_name = t.team_name, - user_team_name = t.user_team_name, - color = t.color, - gold = t.gold, - scroll_to_leader = t.scroll_to_leader, - flag = t.flag, - flag_icon = t.flag_icon, - side = side_number - } + local container = t.__cfg + -- set values not properly handled by the __cfg + container.income = t.total_income + container.side = side_number utils.vwriter.write(writer, container) end end From 8cbd084fc57528f218d6eca1638f1336d44ab913 Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Wed, 15 Feb 2017 00:59:03 -0500 Subject: [PATCH 2/2] Add changelog entry for updated [store_side] --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index a1d312675b45..5c7541290dbc 100644 --- a/changelog +++ b/changelog @@ -35,6 +35,7 @@ Version 1.13.6+dev: * Wesnoth Formula Engine: * New str_upper and str_lower functions for case transformations * WML Engine: + * Update [store_side] to store everything in corresponding wesnoth.sides[*].__cfg * Removed LOW_MEM option when building. * Add color= attribute to [floating_text] * Add ~CHAN() IPF that allows altering images according to formulas