make [set_varialbes] mode=replace as default

this was the previous behaviour. It was broken in variable_info refactor.
wesnoth · Jul 2, 2014 · 2a2c16b · 2a2c16b
1 parent 4ff51a3
commit 2a2c16b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/game_events/action_wml.cpp b/src/game_events/action_wml.cpp
@@ -2147,11 +2147,7 @@ WML_HANDLER_FUNCTION(set_variables, /*event_info*/, cfg)
 	try
 	{
 		const std::string& mode = cfg["mode"];
-		if(mode == "replace")
-		{
-			dest.replace_array(data);
-		}
-		else if(mode == "merge")
+		if(mode == "merge")
 		{
 			if(dest.explicit_index() && data.size() > 1)
 			{
@@ -2168,10 +2164,14 @@ WML_HANDLER_FUNCTION(set_variables, /*event_info*/, cfg)
 		{
 			dest.insert_array(data);
 		}
-		else /*default if(mode == "append")*/
+		else if(mode == "append")
 		{
 			dest.append_array(data);
 		}
+		else /*default if(mode == "replace")*/
+		{
+			dest.replace_array(data);
+		}
 	}
 	catch(const invalid_variablename_exception&)
 	{