From bd98410229b761e5ad81a80539ee1bccca407fd5 Mon Sep 17 00:00:00 2001
From: Andrettin <andre.ng@live.com>
Date: Tue, 31 May 2016 14:41:14 +0200
Subject: [PATCH] Trade settings are now correctly carried over when forming a
 new faction

---
 src/stratagus/grand_strategy.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/stratagus/grand_strategy.cpp b/src/stratagus/grand_strategy.cpp
index d60deb780..0a6acf19a 100644
--- 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;