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

Don't bother trying to standardize event name if there isn't one

Browse source 
Backport of e317f34, f7cc184, cf38553
This commit is contained in:
Celtic Minstrel 2018-03-24 13:34:06 -04:00
parent c0c5fc9d73
commit 6c2a78c35a
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/game_events/manager_impl.cpp
View file

@ -109,8 +109,8 @@ void event_handlers::add_event_handler(const config& cfg, bool is_menu_item)
}
}
if(name.empty()) {
lg::wml_error() << "[event] is missing name field\n";
if(name.empty() && id.empty()) {
lg::wml_error() << "[event] is missing name or id field\n";
return;
}
@ -121,19 +121,21 @@ void event_handlers::add_event_handler(const config& cfg, bool is_menu_item)
// Split the name field...
std::vector<std::string> standardized_names = utils::split(name);
// ...and standardize each one individually. This ensures they're all valid for by-name lookup.
for(std::string& single_name : standardized_names) {
if(!utils::might_contain_variables(single_name)) {
single_name = standardize_name(single_name);
if(!name.empty()) {
// ...and standardize each one individually. This ensures they're all valid for by-name lookup.
for(std::string& single_name : standardized_names) {
if(!utils::might_contain_variables(single_name)) {
single_name = standardize_name(single_name);
}
}
assert(!standardized_names.empty());
// Write the new name back to the config.
name = utils::join(standardized_names);
event_cfg["name"] = name;
}
assert(!standardized_names.empty());
// Write the new name back to the config.
name = utils::join(standardized_names);
event_cfg["name"] = name;
// Create a new handler.
// Do note active_ holds the main shared_ptr, and the other three containers
// construct weak_ptrs from the shared one.