upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 19:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-serializable events being serialized as an empty [event] tag

Browse Source
This commit is contained in:
Celtic Minstrel 2022-06-22 09:31:55 -04:00 committed by Celtic Minstrel
parent 865eface07
commit 72249b1bb3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game_events/manager.cpp
View File

@ -184,7 +184,11 @@ void manager::write_events(config& cfg, bool include_nonserializable) const
assert(!eh->disabled());
}
eh->write_config(cfg.add_child("event"), include_nonserializable);
config event_cfg;
eh->write_config(event_cfg, include_nonserializable);
if(!event_cfg.empty()) {
cfg.add_child("event", std::move(event_cfg));
}
}
cfg["unit_wml_ids"] = utils::join(unit_wml_ids_);

3
src/game_events/manager.hpp
View File

@ -73,6 +73,9 @@ public:
void add_events(const config::const_child_itors& cfgs, game_lua_kernel& lk, const std::string& type = std::string());
// Normally non-serializable events are skipped when serializing (with a warning).
// If include_nonserializable is true, the game attempts to serialize them anyway.
// This will produce output that kind of looks like the event but would not deserialize to the same event.
void write_events(config& cfg, bool include_nonserializable=false) const;
using event_func_t = std::function<void(game_events::manager&, handler_ptr&)>;