From eaa192ffa80e4d699c7b169f6eefdac9be3e0c81 Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Mon, 5 Oct 2015 22:12:41 +0000 Subject: [PATCH] fix [lua] tags beeing lost on reload --- src/play_controller.cpp | 9 ++------- src/scripting/game_lua_kernel.cpp | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/play_controller.cpp b/src/play_controller.cpp index 0a01bc7d608..152e6011a21 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -110,6 +110,7 @@ static void copy_persistent(const config& src, config& dst) static stringset tags = boost::assign::list_of ("terrain_graphics") + ("lua") .convert_to_container(); BOOST_FOREACH(const std::string& attr, attrs) @@ -512,17 +513,11 @@ void play_controller::init_side_end() config play_controller::to_config() const { - config cfg; + config cfg = level_; - cfg.merge_attributes(level_); cfg["replay_pos"] = saved_game_.get_replay().get_pos(); gamestate().write(cfg); - // Write terrain_graphics data in snapshot, too - BOOST_FOREACH(const config& tg, level_.child_range("terrain_graphics")) { - cfg.add_child("terrain_graphics", tg); - } - gui_->write(cfg.add_child("display")); //Write the soundsources. diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index beb4ce25fc6..7425349975a 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -4733,8 +4733,6 @@ void game_lua_kernel::load_game(const config& level) */ void game_lua_kernel::save_game(config &cfg) { - cfg.append_children(cfg, "lua"); - lua_State *L = mState; if (!luaW_getglobal(L, "wesnoth", "game_events", "on_save", NULL))