Do not allow storing templates or loading of stored templates in camp…

…aign. Since templates are stored in the savegame anyway, having stored template support in campaigns is mostly superfluous, and a cause for bugs.
Warzone2100 · Jun 13, 2017 · d935f57 · d935f57
1 parent 123ded5
commit d935f57
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/design.cpp b/src/design.cpp
@@ -538,7 +538,7 @@ bool intAddDesign(bool bShowCentreScreen)
 	sButInit.pDisplay = intDisplayButtonHilight;
 	sButInit.UserData = PACKDWORD_TRI(0, IMAGE_DES_SAVEH, IMAGE_DES_SAVE);
 
-	if (!widgAddButton(psWScreen, &sButInit))
+	if (bMultiPlayer && !widgAddButton(psWScreen, &sButInit))
 	{
 		return false;
 	}
@@ -3020,7 +3020,10 @@ void intProcessDesign(UDWORD id)
 			intSetButtonFlash(IDDES_WPABUTTON,   true);
 			intSetButtonFlash(IDDES_WPBBUTTON,   true);
 
-			widgHide(psWScreen, IDDES_STOREBUTTON);
+			if (bMultiPlayer)
+			{
+				widgHide(psWScreen, IDDES_STOREBUTTON);
+			}
 		}
 		else
 		{
@@ -3068,8 +3071,11 @@ void intProcessDesign(UDWORD id)
 					intSetButtonFlash(IDDES_WPBBUTTON,   true);
 				}
 
-				widgReveal(psWScreen, IDDES_STOREBUTTON);
-				updateStoreButton(sCurrDesign.stored);
+				if (bMultiPlayer)
+				{
+					widgReveal(psWScreen, IDDES_STOREBUTTON);
+					updateStoreButton(sCurrDesign.stored);
+				}
 			}
 		}
 
@@ -3967,11 +3973,17 @@ static bool saveTemplate()
 {
 	if (!intValidTemplate(&sCurrDesign, aCurrName, false, selectedPlayer))
 	{
-		widgHide(psWScreen, IDDES_STOREBUTTON);
+		if (bMultiPlayer)
+		{
+			widgHide(psWScreen, IDDES_STOREBUTTON);
+		}
 		return false;
 	}
-	widgReveal(psWScreen, IDDES_STOREBUTTON);
-	updateStoreButton(sCurrDesign.stored);	// Change the buttons icon
+	if (bMultiPlayer)
+	{
+		widgReveal(psWScreen, IDDES_STOREBUTTON);
+		updateStoreButton(sCurrDesign.stored);	// Change the buttons icon
+	}
 
 	/* if first (New Design) button selected find empty template
 	 * else find current button template

diff --git a/src/init.cpp b/src/init.cpp
@@ -1202,17 +1202,13 @@ bool stageThreeInitialise()
 
 	if (bMultiPlayer)
 	{
-		// FIXME Is this really needed?
-		debug(LOG_WZ, "multiGameInit()\n");
 		multiGameInit();
 		cmdDroidMultiExpBoost(true);
+		initTemplates();
 	}
 
 	preProcessVisibility();
 
-	// Load any stored templates; these need to be available ASAP
-	initTemplates();
-
 	prepareScripts(getLevelLoadType() == GTYPE_SAVE_MIDMISSION || getLevelLoadType() == GTYPE_SAVE_START);
 
 	if (!fpathInitialise())