Split event names before filing handlers by name.

Fixes bug #21577.
wesnoth · Feb 26, 2014 · 7cb0f5b · 7cb0f5b
1 parent 5162b05
commit 7cb0f5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/changelog b/changelog
@@ -9,6 +9,7 @@ Version 1.11.10+dev:
  * WML engine:
    * Bug #21643: Removing fog from a single hex no longer makes the hex ugly.
    * WML files whose names contain spaces are ignored.
+   * Bug #21722: Event handlers with multiple names never fired.
  * User interface:
    * Non-team labels no longer remove team labels that were present in the
      same hex.

diff --git a/src/game_events/handlers.cpp b/src/game_events/handlers.cpp
@@ -191,8 +191,11 @@ namespace { // Types
 		// File by name.
 		if ( utils::might_contain_variables(name) )
 			dynamic_.push_back(new_handler);
-		else
-			by_name_[standardize_name(name)].push_back(new_handler);
+		else {
+			std::vector<std::string> name_list = utils::split(name);
+			BOOST_FOREACH( const std::string & single_name, name_list )
+			by_name_[standardize_name(single_name)].push_back(new_handler);
+		}
 		// File by ID.
 		if ( !id.empty() )
 			id_map_[id] = new_handler;