Fix merging of default facets with composite values

Now the last [value] tag wins.
wesnoth · Mar 22, 2016 · 895a326 · 895a326
1 parent cb0fad0
commit 895a326
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/ai/configuration.cpp b/src/ai/configuration.cpp
@@ -228,6 +228,12 @@ bool configuration::parse_side_config(side_number side, const config& original_c
 			continue;
 		}
 		aspect_cfg.merge_children("default");
+		config& dflt = aspect_cfg.child("default");
+		if (dflt.has_child("value")) {
+			while (dflt.child_count("value") > 1) {
+				dflt.remove_child("value", 0);
+			}
+		}
 	}
 
 	DBG_AI_CONFIGURATION << "side "<< side <<": done parsing side config, it contains:"<< std::endl << parsed_cfg << std::endl;