Pop creation function now has access to the old province and old coun…

…try to look up info.
ParadoxGameConverters · Apr 9, 2011 · 4e1acd6 · 4e1acd6
1 parent 1be5b8b
commit 4e1acd6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 139 deletions.
diff --git a/cpp_version/EU3toV2Converter/DW_cultureMap.txt b/cpp_version/EU3toV2Converter/DW_cultureMap.txt
diff --git a/cpp_version/EU3toV2Converter/EU3World.cpp b/cpp_version/EU3toV2Converter/EU3World.cpp
@@ -51,6 +51,19 @@ vector<EU3Country> EU3World::getCountries()
 }
 
 
+EU3Country* EU3World::getCountry(string tag)
+{
+	for (unsigned int i = 0; i < countries.size(); i++)
+	{
+		if (countries[i].getTag() == tag)
+		{
+			return &(countries[i]);
+		}
+	}
+	return NULL;
+}
+
+
 EU3Province* EU3World::getProvince(int provNum)
 {
 	for (unsigned int i = 0; i < provinces.size(); i++)

diff --git a/cpp_version/EU3toV2Converter/EU3World.h b/cpp_version/EU3toV2Converter/EU3World.h
@@ -12,6 +12,7 @@ class EU3World {
 	public:
 		void						init(Object* obj);
 		vector<EU3Country>	getCountries();
+		EU3Country*				getCountry(string);
 		EU3Province*			getProvince(int provNum);
 		void						removeCountry(string tag);
 	private:

diff --git a/cpp_version/EU3toV2Converter/V2Province.cpp b/cpp_version/EU3toV2Converter/V2Province.cpp
@@ -78,7 +78,7 @@ string V2Province::getOwner()
 }
 
 
-void V2Province::createPops(EU3Province* oldProvince)
+void V2Province::createPops(EU3Province* oldProvince, EU3Country* oldCountry)
 {
 	int farmers			= 0;
 	int labourers		= 0;
@@ -103,11 +103,12 @@ void V2Province::createPops(EU3Province* oldProvince)
 		craftsmen += 5;
 	}
 
-	//If Nation has Slavery ALLOWED, add 5 SLAVES.
+	if (true)  //If Nation has Slavery ALLOWED, add 5 SLAVES. Assumed true for now
+	{
+		slaves += 5;
+	}
 	soldiers	+= 2;
-	//If province has a MANUFACTORY add 2 CRAFTSMEN
-	//If province has a MANUFACTORY add 1 clerk.
-	if(0)
+	if(0)	//If province has a MANUFACTORY
 	{
 		craftsmen	+= 2;
 		clerks		+= 1;
@@ -116,12 +117,12 @@ void V2Province::createPops(EU3Province* oldProvince)
 	clergymen	+= 1;
 	officers		+= 1;
 	//If province is the CAPITAL or NATIONAL FOCUS add 1 BUREAUCRAT
+	//If province is capital or was national focus, add 1 ARISTOCRATS.
 	//If province is CENTER OF TRADE then add 1 CLERK
+	//If province was a COT, add 1 CAPITALISTS.
 	//If government is NOT republic, add 2 ARISTOCRATS.
 	//If government is NOT absolute monarchy, add 2 CAPITALISTS.
-	//If province is capital or was national focus, add 1 ARISTOCRATS.
-	//If province was a COT, add 1 CAPITALISTS.
-	aristocrats	+= 1;
+	aristocrats	+= 1; // temporary for now
 
 	int total = farmers + labourers + slaves + soldiers + craftsmen + artisans + clergymen + clerks + bureaucrats + officers + capitalists + aristocrats;
 

diff --git a/cpp_version/EU3toV2Converter/V2Province.h b/cpp_version/EU3toV2Converter/V2Province.h
@@ -7,6 +7,7 @@
 #include "tempFuncs.h"
 #include "V2Pop.h"
 #include "EU3Province.h"
+#include "EU3Country.h"
 using namespace std;
 
 class V2Province {
@@ -18,7 +19,7 @@ class V2Province {
 		void		setColonial(bool);
 		void		setCulture(string);
 		bool		isColonial();
-		void		createPops(EU3Province* oldProvince);
+		void		createPops(EU3Province* oldProvince, EU3Country* oldCountry);
 		void		output(FILE*);
 	private:
 		bool		land;

diff --git a/cpp_version/EU3toV2Converter/V2World.cpp b/cpp_version/EU3toV2Converter/V2World.cpp
@@ -188,8 +188,8 @@ void V2World::convertProvinces(EU3World sourceWorld, provinceMapping provMap, co
 						log("Error: Could not set culture for province %d\n", destNum);
 						provinces[i].setCulture("");
 					}
-
-					provinces[i].createPops(oldProvince);
+					sourceWorld.getCountry(oldOwner);
+					provinces[i].createPops(oldProvince, sourceWorld.getCountry(oldOwner));
 				}
 			}
 		}