Allow scripts to control whether new designs are allowed. Default off.

Warzone2100 · Jan 18, 2012 · 599dddf · 599dddf
1 parent a51de16
commit 599dddf
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 3 deletions.
diff --git a/data/mp/multiplay/skirmish/rules.js b/data/mp/multiplay/skirmish/rules.js
@@ -244,7 +244,8 @@ function eventStructureBuilt(struct)
 {
 	if (struct.player == selectedPlayer && struct.type == STRUCTURE && struct.stattype == HQ)
 	{
-		setMiniMap(true); // hide minimap if HQ is destroyed
+		setMiniMap(true); // show minimap
+		setDesign(true); // permit designs
 	}
 }
 
@@ -253,5 +254,6 @@ function eventDestroyed(victim)
 	if (victim.player == selectedPlayer && victim.type == STRUCTURE && victim.stattype == HQ)
 	{
 		setMiniMap(false); // hide minimap if HQ is destroyed
+		//setDesign(false); // and disallow design
 	}
 }
diff --git a/src/droiddef.h b/src/droiddef.h
@@ -119,6 +119,7 @@ struct DROID_TEMPLATE : public BASE_STATS
 	DROID_TEMPLATE* psNext;                     ///< Pointer to next template
 	bool		prefab;                     ///< Not player designed, not saved, never delete or change
 	bool		stored;                     ///< Stored template
+	bool		enabled;                    ///< Has been enabled
 };
 
 struct PACKAGED_CHECK;

diff --git a/src/game.cpp b/src/game.cpp
@@ -3669,6 +3669,7 @@ bool gameLoadV(PHYSFS_file* fileHandle, unsigned int version)
 		}
 	}
 	radarPermitted = (bool)powerSaved[0].extractedPower; // nice hack, eh? don't want to break savegames now...
+	allowDesign = (bool)powerSaved[1].extractedPower; // nice hack, eh? don't want to break savegames now...
 
 	return true;
 }
@@ -3748,6 +3749,7 @@ static bool writeGameFile(const char* fileName, SDWORD saveType)
 		saveGame.power[i].currentPower = getPower(i);
 	}
 	saveGame.power[0].extractedPower = radarPermitted; // hideous hack, don't want to break savegames now...
+	saveGame.power[1].extractedPower = allowDesign; // hideous hack, don't want to break savegames now...
 
 	//camera position
 	disp3d_getView(&(saveGame.currentPlayerPos));

diff --git a/src/hci.cpp b/src/hci.cpp
@@ -6032,7 +6032,7 @@ void intCheckReticuleButtons(void)
 	ReticuleEnabled[RETBUT_FACTORY].Enabled = editMode;
 	ReticuleEnabled[RETBUT_RESEARCH].Enabled = false;
 	ReticuleEnabled[RETBUT_BUILD].Enabled = editMode;
-	ReticuleEnabled[RETBUT_DESIGN].Enabled = true;
+	ReticuleEnabled[RETBUT_DESIGN].Enabled = allowDesign;
 	ReticuleEnabled[RETBUT_INTELMAP].Enabled = true;
 	ReticuleEnabled[RETBUT_COMMAND].Enabled = false;
 

diff --git a/src/init.cpp b/src/init.cpp
@@ -1271,6 +1271,7 @@ static void	initMiscVars(void)
 
 	radarOnScreen = true;
 	radarPermitted = true;
+	allowDesign = true;
 	enableConsoleDisplay(true);
 
 	setSelectedGroup(UBYTE_MAX);

diff --git a/src/qtscriptfuncs.cpp b/src/qtscriptfuncs.cpp
@@ -1580,6 +1580,27 @@ static QScriptValue js_setMiniMap(QScriptContext *context, QScriptEngine *engine
 	return QScriptValue();
 }
 
+//-- \subsection{setDesign(bool)} Whether to allow player to design stuff.
+static QScriptValue js_setDesign(QScriptContext *context, QScriptEngine *engine)
+{
+	DROID_TEMPLATE *psCurr;
+	allowDesign = context->argument(0).toBool();
+	// Switch on or off future templates
+	// FIXME: This dual data structure for templates is just plain insane.
+	for (psCurr = apsDroidTemplates[selectedPlayer]; psCurr != NULL; psCurr = psCurr->psNext)
+	{
+		bool researched = researchedTemplate(psCurr, selectedPlayer);
+		psCurr->enabled = (researched || allowDesign);
+	}
+	for (std::list<DROID_TEMPLATE>::iterator i = localTemplates.begin(); i != localTemplates.end(); ++i)
+	{
+		psCurr = &*i;
+		bool researched = researchedTemplate(psCurr, selectedPlayer);
+		psCurr->enabled = (researched || allowDesign);
+	}
+	return QScriptValue();
+}
+
 //-- \subsection{addReticuleButton(button type)} Add reticule button. FIXME: This currently only works in tutorial.
 static QScriptValue js_addReticuleButton(QScriptContext *context, QScriptEngine *engine)
 {
@@ -1880,6 +1901,7 @@ bool registerFunctions(QScriptEngine *engine)
 	engine->globalObject().setProperty("enableResearch", engine->newFunction(js_enableResearch));
 	engine->globalObject().setProperty("setPower", engine->newFunction(js_setPower));
 	engine->globalObject().setProperty("setTutorialMode", engine->newFunction(js_setTutorialMode));
+	engine->globalObject().setProperty("setDesign", engine->newFunction(js_setDesign));
 	engine->globalObject().setProperty("setMiniMap", engine->newFunction(js_setMiniMap));
 	engine->globalObject().setProperty("addReticuleButton", engine->newFunction(js_addReticuleButton));
 	engine->globalObject().setProperty("removeReticuleButton", engine->newFunction(js_removeReticuleButton));

diff --git a/src/template.cpp b/src/template.cpp
@@ -46,6 +46,8 @@ extern DROID_TEMPLATE	sDefaultDesignTemplate;
 DROID_TEMPLATE		*apsDroidTemplates[MAX_PLAYERS];
 DROID_TEMPLATE		*apsStaticTemplates;	// for AIs and scripts
 
+bool allowDesign = true;
+
 static const StringToEnum<DROID_TYPE> map_DROID_TYPE[] =
 {
 	{"PERSON",              DROID_PERSON            },
@@ -152,6 +154,7 @@ bool initTemplates()
 			ini.endGroup();
 			continue; // next!
 		}
+		design.enabled = allowDesign;
 		addTemplateToList(&design, &apsDroidTemplates[selectedPlayer]);
 		sendTemplate(selectedPlayer, &design);
 		localTemplates.push_back(design);
@@ -274,6 +277,7 @@ DROID_TEMPLATE::DROID_TEMPLATE(LineView line)
 	, psNext(NULL)
 	, prefab(false)
 	, stored(false)
+	, enabled(true)
 	// Ignored columns: 6 - but used later to decide whether the template is for human players.
 {
 	std::string name = line.s(0);
@@ -688,7 +692,7 @@ void fillTemplateList(std::vector<DROID_TEMPLATE *> &pList, STRUCTURE *psFactory
 			}
 		}
 
-		if (!validTemplateForFactory(psCurr, psFactory) || !researchedTemplate(psCurr, player))
+		if (!psCurr->enabled || !validTemplateForFactory(psCurr, psFactory) || !researchedTemplate(psCurr, player))
 		{
 			continue;
 		}

diff --git a/src/template.h b/src/template.h
@@ -7,6 +7,8 @@
 extern DROID_TEMPLATE			*apsDroidTemplates[MAX_PLAYERS];
 extern DROID_TEMPLATE			*apsStaticTemplates;			// for AIs and scripts
 
+extern bool allowDesign;
+
 bool initTemplates();
 bool shutdownTemplates();
 bool storeTemplates();