From 0e1b968e8dde2a6946a9c35735b2f9bfa9e24f63 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sat, 26 Sep 2020 23:33:26 -0400 Subject: [PATCH] Convert uses of the old GUI2 API in World Conquest --- .../lua/game_mechanics/invest/invest_show_dialog.lua | 2 +- .../lua/game_mechanics/invest/invest_tellunit.lua | 8 ++++---- .../lua/game_mechanics/pickup_confirmation_dialog.lua | 2 +- .../World_Conquest/lua/game_mechanics/wocopedia/help.lua | 2 +- .../World_Conquest/lua/map/settings/settings_dialog.lua | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/campaigns/World_Conquest/lua/game_mechanics/invest/invest_show_dialog.lua b/data/campaigns/World_Conquest/lua/game_mechanics/invest/invest_show_dialog.lua index 78d602ba987a8..144f00acf795f 100644 --- a/data/campaigns/World_Conquest/lua/game_mechanics/invest/invest_show_dialog.lua +++ b/data/campaigns/World_Conquest/lua/game_mechanics/invest/invest_show_dialog.lua @@ -165,7 +165,7 @@ function wc2_show_invest_dialog_impl(args) res = selected_data.res end end - local d_res = wesnoth.show_dialog(dialog_wml, preshow) + local d_res = gui.show_dialog(dialog_wml, preshow) return d_res, res end diff --git a/data/campaigns/World_Conquest/lua/game_mechanics/invest/invest_tellunit.lua b/data/campaigns/World_Conquest/lua/game_mechanics/invest/invest_tellunit.lua index 6dd6c84023835..e4a46a3b50c4e 100644 --- a/data/campaigns/World_Conquest/lua/game_mechanics/invest/invest_tellunit.lua +++ b/data/campaigns/World_Conquest/lua/game_mechanics/invest/invest_tellunit.lua @@ -61,12 +61,12 @@ function invest_tellunit.execute(unit_type) if not wesnoth.sides[wesnoth.current.side].is_local then return end - local function preshow() - wesnoth.set_dialog_value(wc2_color.tc_image(unit_type.image), "icon") - wesnoth.set_dialog_value(unit_type.name, "name") + local function preshow(dialog) + dialog.icon.label = wc2_color.tc_image(unit_type.image) + dialog.name.label = unit_type.name end - wesnoth.show_dialog(invest_tellunit.dialog_wml, preshow) + gui.show_dialog(invest_tellunit.dialog_wml, preshow) end return invest_tellunit diff --git a/data/campaigns/World_Conquest/lua/game_mechanics/pickup_confirmation_dialog.lua b/data/campaigns/World_Conquest/lua/game_mechanics/pickup_confirmation_dialog.lua index af57186170e91..07dfb947c1245 100644 --- a/data/campaigns/World_Conquest/lua/game_mechanics/pickup_confirmation_dialog.lua +++ b/data/campaigns/World_Conquest/lua/game_mechanics/pickup_confirmation_dialog.lua @@ -83,7 +83,7 @@ local function show_dialog(unit, item_image) dialog.item_icon.label = item_image dialog.res_yes:focus() end - local res = wesnoth.show_dialog(dialog_wml, preshow) + local res = gui.show_dialog(dialog_wml, preshow) return res == 1 or res == -1 end diff --git a/data/campaigns/World_Conquest/lua/game_mechanics/wocopedia/help.lua b/data/campaigns/World_Conquest/lua/game_mechanics/wocopedia/help.lua index 7235645a4639a..a95d3442f719e 100644 --- a/data/campaigns/World_Conquest/lua/game_mechanics/wocopedia/help.lua +++ b/data/campaigns/World_Conquest/lua/game_mechanics/wocopedia/help.lua @@ -242,7 +242,7 @@ function wesnoth.wml_actions.wc2_show_wocopedia(cfg) end end - wesnoth.show_dialog(dialog, preshow) + gui.show_dialog(dialog, preshow) end wc2_utils.menu_item { diff --git a/data/campaigns/World_Conquest/lua/map/settings/settings_dialog.lua b/data/campaigns/World_Conquest/lua/map/settings/settings_dialog.lua index 300772a4952af..932aee3ab1446 100644 --- a/data/campaigns/World_Conquest/lua/map/settings/settings_dialog.lua +++ b/data/campaigns/World_Conquest/lua/map/settings/settings_dialog.lua @@ -299,5 +299,5 @@ function wc2_debug_settings(nplayers) globals.settings.ncastles = window.sl_ncastles.value end - wesnoth.show_dialog(dialog_wml, preshow, postshow) + gui.show_dialog(dialog_wml, preshow, postshow) end