From 26d303d854a2344213c2b6160bf501b24e38fb2e Mon Sep 17 00:00:00 2001
From: leper <leper@wildfiregames.com>
Date: Sun, 8 Feb 2015 23:07:18 +0000
Subject: [PATCH] Improve mod support of the structree. Patch by s0600204.

Adapt structree for changes from the balancing branch.

This was SVN commit r16308.
---
 binaries/data/mods/public/gui/pregame/mainmenu.xml   | 2 +-
 binaries/data/mods/public/gui/structree/rows.xml     | 2 +-
 binaries/data/mods/public/gui/structree/structree.js | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 33ae9a14d6..018a20f0ad 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -139,7 +139,7 @@
 			size="60 50%-100 300 50%+100"
 			hidden="true"
 		>
-			<!-- submenuSinglePlayer -->
+			<!-- submenuLearnToPlay -->
 			<object name="submenuLearn"
 				type="image"
 				size="0 4 100%-4 100%-4"
diff --git a/binaries/data/mods/public/gui/structree/rows.xml b/binaries/data/mods/public/gui/structree/rows.xml
index 778a8957e9..b4e571fc75 100644
--- a/binaries/data/mods/public/gui/structree/rows.xml
+++ b/binaries/data/mods/public/gui/structree/rows.xml
@@ -3,7 +3,7 @@
 <object name="phase_rows">
 	<repeat count="4" var="k">
 		<object name="phase[k]">
-			<repeat count="11" var="s">
+			<repeat count="12" var="s">
 				<object type="image" style="StructBox" name="phase[k]_struct[s]">
 					<object type="text" style="StructNameSpecific" name="phase[k]_struct[s]_name"/>
 					<object type="image" style="StructIcon" name="phase[k]_struct[s]_icon"
diff --git a/binaries/data/mods/public/gui/structree/structree.js b/binaries/data/mods/public/gui/structree/structree.js
index a2fe0eaf30..29865d125d 100644
--- a/binaries/data/mods/public/gui/structree/structree.js
+++ b/binaries/data/mods/public/gui/structree/structree.js
@@ -231,15 +231,14 @@ function selectCiv(civCode)
 
 	// Determine the buildList for the civ (grouped by phase)
 	var buildList = {};
+	for (let pha of g_ParsedData.phaseList)
+		buildList[pha] = [];
 	for (let structCode of g_Lists.structures)
 	{
 		if (!g_ParsedData.structures[structCode].phase || startStructs.indexOf(structCode) > -1)
 			g_ParsedData.structures[structCode].phase = g_ParsedData.phaseList[0];
 
 		let myPhase = g_ParsedData.structures[structCode].phase;
-
-		if (!(myPhase in buildList))
-			buildList[myPhase] = [];
 		buildList[myPhase].push(structCode);
 	}