Merge 'remotes/trunk'

0ad · Aug 26, 2021 · 6588265 · 6588265
2 parents 7faf17e + ee7f489
commit 6588265
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/binaries/data/mods/public/gui/gamesettings/attributes/MatchID.js b/binaries/data/mods/public/gui/gamesettings/attributes/MatchID.js
@@ -2,7 +2,7 @@ GameSettings.prototype.Attributes.MatchID = class MatchID extends GameSetting
 {
 	init()
 	{
-		this.matchID = Engine.GetMatchID();
+		this.matchID = 0;
 	}
 
 	toInitAttributes(attribs)
@@ -15,4 +15,9 @@ GameSettings.prototype.Attributes.MatchID = class MatchID extends GameSetting
 		if (attribs.matchID !== undefined)
 			this.matchID = attribs.matchID;
 	}
+
+	pickRandomItems()
+	{
+		this.matchID = Engine.GetMatchID();
+	}
 };
diff --git a/binaries/system/glooxwrapper.dll b/binaries/system/glooxwrapper.dll
diff --git a/binaries/system/glooxwrapper.pdb b/binaries/system/glooxwrapper.pdb
diff --git a/binaries/system/glooxwrapper_dbg.dll b/binaries/system/glooxwrapper_dbg.dll
diff --git a/binaries/system/glooxwrapper_dbg.pdb b/binaries/system/glooxwrapper_dbg.pdb