Merge branch 'master' into sdl2

RELEASE_NOTES

@@ -22,6 +22,10 @@ Example contents.
 Describe how awesome the new game version dialog is and how it replaces the old game paths dialog from 1.12.x
 [/rasection]
 
+[rasection="Fixed OOS errors on random maps"]
+Some people experienced OOS errors on random maps due to sides being placed in different castles in the beginning of the game. This has now been fixed.
+[/rasection]
+
 ==========
 KNOWN BUGS
 ==========

changelog

@@ -96,6 +96,7 @@ Version 1.13.1+dev:
    * Fixed problems with slow/poison/petrify sounds (bug #23024) and made the
      sounds play automatically when the status is inflicted in combat, instead
      of being played by attack animations.
+   * Fixed OOS on random maps, where clients placed sides in different castles.
 
 Version 1.13.1:
  * Security fixes:

data/tools/unit_tree/update-wmlunits

@@ -25,6 +25,7 @@ BUILD=$DIR/build
 TOOLS=${TOOLS:-$SOURCES/master/data/tools}
 export TEMP=$DIR/temp
 
+rm -rf $CONFIG/data/add-ons
 mkdir -p $CONFIG/data/add-ons
 mkdir -p $ADDONS
 mkdir -p $LOG

data/tools/wmlunits

@@ -294,7 +294,12 @@ def list_contents():
 
     for i, addon in enumerate(addons):
         if not os.path.isdir(options.addons + "/" + addon): continue
-        sys.stdout.write("%4d/%4d " % (1 + i, len(addons)) + addon + " ... ")
+        mem = "? KB"
+        try:
+            mem = dict([x.split("\t", 1) for x in open("/proc/self/status").read().split("\n") if x])["VmRSS:"]
+        except:
+            pass
+        sys.stdout.write("%4d/%4d " % (1 + i, len(addons)) + addon + " [" + mem + "] ... ")
         sys.stdout.flush()
         d = options.output + "/" + addon
         logname = d + "/error.log"

players_changelog

@@ -30,6 +30,9 @@ Version 1.13.1+dev:
    * By default, labels placed by ignored players are hidden. You can override
      this using the above interface.
 
+ * Miscellaneous and bug fixes:
+   * Fixed OOS on random maps, where clients placed sides in different castles.
+
 
 Version 1.13.1:
  * Security fixes:

src/game_state.cpp

@@ -115,7 +115,7 @@ void game_state::place_sides_in_preferred_locations()
 		++side_num;
 	}
 
-	std::sort(placings.begin(),placings.end());
+	std::stable_sort(placings.begin(),placings.end());
 	std::set<int> placed;
 	std::set<map_location> positions_taken;