From 55a6c16810a03f51f96f1f807e66a55fcbe50daa Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sun, 11 Mar 2018 12:55:30 -0400 Subject: [PATCH] Lua API reorganization: interface module deprecations --- data/lua/core.lua | 16 ++++++++++++++++ data/lua/helper.lua | 7 +------ data/lua/wml/items.lua | 12 +++++++++--- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/data/lua/core.lua b/data/lua/core.lua index cd2bb0b898f..ce5bda95f4c 100644 --- a/data/lua/core.lua +++ b/data/lua/core.lua @@ -496,6 +496,22 @@ if wesnoth.kernel_type() == "Game Lua Kernel" then wesnoth.get_variable = wesnoth.deprecate_api('wesnoth.get_variable', 'wml.variables', 1, nil, wesnoth.get_variable) wesnoth.set_variable = wesnoth.deprecate_api('wesnoth.set_variable', 'wml.variables', 1, nil, wesnoth.set_variable) wesnoth.get_all_vars = wesnoth.deprecate_api('wesnoth.get_all_vars', 'wml.all_variables', 1, nil, wesnoth.get_all_vars) + -- Interface module + wesnoth.delay = wesnoth.deprecate_api('wesnoth.delay', 'wesnoth.interface.delay', 1, nil, wesnoth.interface.delay) + wesnoth.float_label = wesnoth.deprecate_api('wesnoth.float_label', 'wesnoth.interface.float_label', 1, nil, wesnoth.interface.float_label) + wesnoth.select_unit = wesnoth.deprecate_api('wesnoth.select_unit', 'wesnoth.interface.select_unit', 1, nil, wesnoth.interface.select_unit) + wesnoth.highlight_hex = wesnoth.deprecate_api('wesnoth.highlight_hex', 'wesnoth.interface.highlight_hex', 1, nil, wesnoth.interface.highlight_hex) + wesnoth.deselect_hex = wesnoth.deprecate_api('wesnoth.deselect_hex', 'wesnoth.interface.deselect_hex', 1, nil, wesnoth.interface.deselect_hex) + wesnoth.get_selected_tile = wesnoth.deprecate_api('wesnoth.get_selected_tile', 'wesnoth.interface.get_selected_hex', 1, nil, wesnoth.interface.get_selected_) + wesnoth.scroll_to_tile = wesnoth.deprecate_api('wesnoth.scroll_to_tile', 'wesnot.interface.scroll_to_hex', 1, nil, wesnoth.interface.scroll_to_hex) + wesnoth.lock_view = wesnoth.deprecate_api('wesnoth.lock_view', 'wesnoth.interface.lock', 1, nil, wesnoth.interface.lock) + wesnoth.view_locked = wesnoth.deprecate_api('wesnoth.view_locked', 'wesnoth.interface.is_locked', 1, nil, wesnoth.interface.is_locked) + wesnoth.is_skipping_messages = wesnoth.deprecate_api('wesnoth.is_skipping_messages', 'wesnoth.interface.is_skipping_messages', 1, nil, wesnoth.interface.is_skipping_messages) + wesnoth.skip_messages = wesnoth.deprecate_api('wesnoth.skip_messages', 'wesnoth.interface.skip_messages', 1, nil, wesnoth.interface.skip_messages) + wesnoth.add_tile_overlay = wesnoth.deprecate_api('wesnoth.add_tile_overlay', 'wesnoth.interface.add_hex_overlay', 1, nil, wesnoth.interface.add_hex_overlay) + wesnoth.remove_tile_overlay = wesnoth.deprecate_api('wesnoth.remove_tile_overlay', 'wesnoth.interface.remove_hex_overlay', 1, nil, wesnoth.interface.remove_hex_overlay) + wesnoth.theme_items = wesnoth.deprecate_api('wesnoth.theme_items', 'wesnoth.interface.game_display', 1, nil, wesnoth.interface.game_display) + wesnoth.get_displayed_unit = wesnoth.deprecate_api('wesnoth.get_displayed_unit', 'wesnoth.interface.get_displayed_unit', 1, nil, wesnoth.interface.get_displayed_unit) end wesnoth.tovconfig = wesnoth.deprecate_api('wesnoth.tovconfig', 'wml.tovconfig', 1, nil, wesnoth.tovconfig) wesnoth.debug = wesnoth.deprecate_api('wesnoth.debug', 'wml.tostring', 1, nil, wesnoth.debug) diff --git a/data/lua/helper.lua b/data/lua/helper.lua index 30ce3a6b5ed..d93516f0e82 100644 --- a/data/lua/helper.lua +++ b/data/lua/helper.lua @@ -50,12 +50,6 @@ function helper.modify_unit(filter, vars) end end ---! Fakes the move of a unit satisfying the given @a filter to position @a x, @a y. ---! @note Usable only during WML actions. -function helper.move_unit_fake(filter, to_x, to_y) - wesnoth.interface.move_unit_fake(filter, to_x, to_y) -end - -- Metatable that redirects access to wml.variables_proxy local proxy_var_mt = { __metatable = "WML variables", @@ -289,5 +283,6 @@ helper.shallow_literal = wesnoth.deprecate_api('helper.shallow_literal', 'wml.sh helper.shallow_parsed = wesnoth.deprecate_api('helper.shallow_parsed', 'wml.shallow_parsed', 1, nil, wml.shallow_parsed) helper.set_wml_var_metatable = wesnoth.deprecate_api('helper.set_wml_var_metatable', 'wml.variable.proxy', 2, nil, helper.set_wml_var_metatable) helper.set_wml_tag_metatable = wesnoth.deprecate_api('helper.set_wml_tag_metatable', 'wml.tag', 2, nil, helper.set_wml_tag_metatable) +helper.move_unit_fake = wesnoth.deprecate_api('helper.move_unit_fake', 'wesnoth.interface.move_unit_fake', 1, nil, wesnoth.interface.move_unit_fake) return helper diff --git a/data/lua/wml/items.lua b/data/lua/wml/items.lua index 8f7e61137ea..ba1a3d18480 100644 --- a/data/lua/wml/items.lua +++ b/data/lua/wml/items.lua @@ -103,13 +103,13 @@ function wml_actions.store_items(cfg) end end -local methods = { remove = remove_overlay } +wesnoth.intf.remove_item = remove_overlay -function methods.place_image(x, y, name) +function wesnoth.intf.add_item_image(x, y, name) add_overlay(x, y, { x = x, y = y, image = name }) end -function methods.place_halo(x, y, name) +function wesnoth.intf.add_item_halo(x, y, name) add_overlay(x, y, { x = x, y = y, halo = name }) end @@ -117,4 +117,10 @@ wesnoth.intf.remove_item = methods.remove wesnoth.intf.add_item_image = methods.place_image wesnoth.intf.add_item_halo = methods.place_halo +local methods = { + remove = wesnoth.deprecate_api('items.remove', 'wesnoth.intf.remove_item', 1, nil, remove_overlay), + place_image = wesnoth.deprecate_api('items.place_image', 'wesnoth.intf.add_item_image', 1, nil, wesnoth.intf.add_item_image), + place_halo = wesnoth.deprecate_api('items.place_halo', 'wesnoth.intf.add_item_halo', 1, nil, wesnoth.intf.add_item_halo) +} + return methods