0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lua: Flip functions moved to the wml module

Browse source 
This means that they are now added to the WML module by default in C++, and only duplicated to the Wesnoth module in Lua.
This commit is contained in:
Celtic Minstrel 2019-11-13 00:40:29 -05:00
parent 4f33470ada
commit 36dc3200c5
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/lua/core.lua
View file

@ -19,9 +19,6 @@ end
--[========[Config Manipulation Functions]========]
wml.tovconfig = wesnoth.tovconfig
wml.tostring = wesnoth.debug
local function ensure_config(cfg)
if type(cfg) == 'table' then
return true
@ -633,8 +630,8 @@ if wesnoth.kernel_type() == "Game Lua Kernel" then
wesnoth.transform_unit = wesnoth.deprecate_api('wesnoth.transform_unit', 'wesnoth.units.transform', 1, nil, wesnoth.units.transform)
wesnoth.select_unit = wesnoth.deprecate_api('wesnoth.select_unit', 'wesnoth.units.select', 1, nil, wesnoth.units.select)
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)
wesnoth.tovconfig = wesnoth.deprecate_api('wesnoth.tovconfig', 'wml.tovconfig', 1, nil, wml.tovconfig)
wesnoth.debug = wesnoth.deprecate_api('wesnoth.debug', 'wml.tostring', 1, nil, wml.tostring)
-- GUI module
wesnoth.show_menu = wesnoth.deprecate_api('wesnoth.show_menu', 'gui.show_menu', 1, nil, gui.show_menu)
wesnoth.show_message_dialog = wesnoth.deprecate_api('wesnoth.show_message_dialog', 'gui.show_narration', 1, nil, gui.show_narration)

4
src/scripting/lua_kernel_base.cpp
View file

@ -629,13 +629,11 @@ lua_kernel_base::lua_kernel_base()
static luaL_Reg const callbacks[] {
{ "compare_versions", &intf_compare_versions },
{ "debug", &intf_wml_tostring },
{ "deprecated_message", &intf_deprecated_message },
{ "have_file", &lua_fileops::intf_have_file },
{ "read_file", &lua_fileops::intf_read_file },
{ "canonical_path", &lua_fileops::intf_canonical_path },
{ "textdomain", &lua_common::intf_textdomain },
{ "tovconfig", &lua_common::intf_tovconfig },
{ "get_dialog_value", &lua_gui2::intf_get_dialog_value },
{ "set_dialog_tooltip", &lua_gui2::intf_set_dialog_tooltip },
{ "set_dialog_active", &lua_gui2::intf_set_dialog_active },
@ -689,6 +687,8 @@ lua_kernel_base::lua_kernel_base()
{ "diff", &intf_wml_diff},
{ "patch", &intf_wml_patch},
{ "matches_filter", &intf_wml_matches_filter},
{ "tostring", &intf_wml_tostring},
{ "tovconfig", &lua_common::intf_tovconfig},
{ nullptr, nullptr },
};
lua_newtable(L);