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

replace wesnoth.set_next_scenario() with wesnoth.game_config.next_scenario setter/getter

Browse source
This commit is contained in:
gfgtdf 2017-03-20 02:48:03 +01:00 • committed by GitHub
parent 27b4a8f4ed
commit bd6a0c69d1
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/lua/wml/endlevel.lua
View file

@ -11,7 +11,7 @@ function wesnoth.wml_actions.endlevel(cfg)
local next_scenario = cfg.next_scenario
if next_scenario then
wesnoth.set_next_scenario(next_scenario)
wesnoth.game_config.next_scenario = next_scenario
end
local end_text = cfg.end_text
@ -92,4 +92,4 @@ function wesnoth.wml_actions.endlevel(cfg)
proceed_to_next_level = proceed_to_next_level,
result = victory and "victory" or "defeat",
}
end
end

3
src/scripting/game_lua_kernel.cpp
View file

@ -821,6 +821,7 @@ int game_lua_kernel::intf_set_end_campaign_text(lua_State *L)
int game_lua_kernel::intf_set_next_scenario(lua_State *L)
{
WRN_LUA << "wesnoth.set_next_scenario() is deprecated" << std::endl;
gamedata().set_next_scenario(luaL_checkstring(L, 1));
return 0;
}
@ -1228,6 +1229,7 @@ int game_lua_kernel::impl_game_config_get(lua_State *L)
return_int_attrib("kill_experience", game_config::kill_experience);
return_int_attrib("last_turn", tod_man().number_of_turns());
return_string_attrib("version", game_config::version);
return_string_attrib("next_scenario", gamedata().next_scenario());
return_bool_attrib("debug", game_config::debug);
return_bool_attrib("debug_lua", game_config::debug_lua);
return_bool_attrib("mp_debug", game_config::mp_debug);
@ -1273,6 +1275,7 @@ int game_lua_kernel::impl_game_config_set(lua_State *L)
modify_int_attrib("recall_cost", game_config::recall_cost = value);
modify_int_attrib("kill_experience", game_config::kill_experience = value);
modify_int_attrib("last_turn", tod_man().set_number_of_turns_by_wml(value));
modify_string_attrib("next_scenario", gamedata().set_next_scenario(value));
std::string err_msg = "unknown modifiable property of game_config: ";
err_msg += m;