Do not halt factory production assigned to commanders in skirmish on …

…commander limit, or for VTOLs. Since unlimited VTOLs can be assigned to commanders, do not halt production of them. Since .psCommander is not synchronised, do not depend on it in synchronised code in skirmish. Fixes ticket:2138.
Warzone2100 · Sep 20, 2012 · 0773a9f · 0773a9f
1 parent 5600178
commit 0773a9f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/structure.cpp b/src/structure.cpp
@@ -2525,13 +2525,19 @@ static bool structPlaceDroid(STRUCTURE *psStructure, DROID_TEMPLATE *psTempl,
 
 static bool IsFactoryCommanderGroupFull(const FACTORY* psFactory)
 {
+	if (bMultiPlayer)
+	{
+		// TODO: Synchronise .psCommander. Have to return false here, to avoid desynch.
+		return false;
+	}
+
 	unsigned int DroidsInGroup;
 
 	// If we don't have a commander return false (group not full)
 	if (psFactory->psCommander==NULL) return false;
 
 	// allow any number of IDF droids
-	if (templateIsIDF((DROID_TEMPLATE *)psFactory->psSubject))
+	if (templateIsIDF(psFactory->psSubject) || asPropulsionStats[psFactory->psSubject->asParts[COMP_PROPULSION]].propulsionType == PROPULSION_TYPE_LIFT)
 	{
 		return false;
 	}