Trade settings are now correctly carried over when forming a new faction

Andrettin · May 31, 2016 · bd98410 · bd98410
1 parent 763a80e
commit bd98410
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/stratagus/grand_strategy.cpp b/src/stratagus/grand_strategy.cpp
@@ -4302,6 +4302,9 @@ void CGrandStrategyFaction::FormFaction(int civilization, int faction)
 
 	for (int i = 0; i < MaxCosts; ++i) {
 		GrandStrategyGame.Factions[new_civilization][new_faction]->Resources[i] = this->Resources[i];
+		GrandStrategyGame.Factions[new_civilization][new_faction]->Trade[i] = this->Trade[i];
+		this->Resources[i] = 0;
+		this->Trade[i] = 0;
 	}
 
 	GrandStrategyGame.Factions[new_civilization][new_faction]->CurrentResearch = GrandStrategyGame.Factions[old_civilization][old_faction]->CurrentResearch;