Check for redundant templates in JS function setDesign().

Warzone2100 · Jun 14, 2019 · 370cfd6 · 370cfd6
1 parent 44eb5e4
commit 370cfd6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/data/base/script/rules.js b/data/base/script/rules.js
@@ -156,6 +156,7 @@ function reticuleDesignCheck()
 	{
 		setReticuleButton(4, _("Design - construct HQ first"), "", "");
 		setMiniMap(false);
+		// Will enable templates that are researched whenever the reticule buttons update.
 		setDesign(false);
 	}
 }

diff --git a/data/mp/multiplay/skirmish/rules.js b/data/mp/multiplay/skirmish/rules.js
@@ -108,7 +108,6 @@ function reticuleDesignCheck()
 	{
 		setReticuleButton(4, _("Design - construct HQ first"), "", "");
 		setMiniMap(false);
-		setDesign(false);
 	}
 }
 

diff --git a/src/qtscriptfuncs.cpp b/src/qtscriptfuncs.cpp
@@ -3251,13 +3251,13 @@ static QScriptValue js_setDesign(QScriptContext *context, QScriptEngine *engine)
 	// FIXME: This dual data structure for templates is just plain insane.
 	for (auto &keyvaluepair : droidTemplates[selectedPlayer])
 	{
-		bool researched = researchedTemplate(keyvaluepair.second, selectedPlayer);
+		bool researched = researchedTemplate(keyvaluepair.second, selectedPlayer, true);
 		keyvaluepair.second->enabled = (researched || allowDesign);
 	}
 	for (auto &localTemplate : localTemplates)
 	{
 		psCurr = &localTemplate;
-		bool researched = researchedTemplate(psCurr, selectedPlayer);
+		bool researched = researchedTemplate(psCurr, selectedPlayer, true);
 		psCurr->enabled = (researched || allowDesign);
 	}
 	return QScriptValue();