Resolve merge issues

ParadoxGameConverters · Jun 29, 2013 · e34ed3c · e34ed3c
1 parent e3bc48c
commit e34ed3c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 21 deletions.
diff --git a/Data Files/Changelog.txt b/Data Files/Changelog.txt
@@ -410,18 +410,18 @@ Revision	Log Message
 403		Actually set preferred unit type
 404		Get vassals to appear
 405		Rulers properly absorb all their own holdings
-406		Actually read in crown authority
-407		Fix some typos
-408		Merge main into minor
-409		Aztecs convert as a horde
-410		Include chinese faction system
-411		If a converted nation has ROTW provinces, make those provinces the nation's religion
-412		Some provinces forced to always start unsettled
-413		Improvments to economic estimations
-414
-415
-416
-417
+406		Merge main into minor
+407		Aztecs convert as a horde
+408		Include chinese faction system
+409		If a converted nation has ROTW provinces, make those provinces the nation's religion
+410		Some provinces forced to always start unsettled
+411		Improvments to economic estimations
+412		Added UI project to solution
+413		Committing deleted files from central repository. This was apparently needed.
+414		Merge
+415		Adding UI project
+416		Actually read in crown authority
+417		Fix some typos
 418		Update culture and religion mappings for 1.10
 419		Replace hard coded path with system variable
 420		Adjust tech for 1.10
@@ -440,10 +440,10 @@ Revision	Log Message
 433		Autogenerated tags must be three characters long
 434		Added tag 0.8A Release for changeset 99d3aaaf9719
 435		Centralization slider
-436		Update converter mod with new empires
-437
+436		Merge main into mod
+437		Update converter mod
 438		Aristocracy/Plutocracy slider
-439
+439		Update converter mod with new empires
 440		Innovative/Narrowminded slider
 441		Serfdom/Freesubjects slider
 442		Mercantilism/Freetrade slider
@@ -452,4 +452,8 @@ Revision	Log Message
 445		Offensive/Defensive slider
 446		Update for 1.10 titles, including horde mechanics for Mongol empire
 447		Fix primogeniture and ultimogeniture succession
-448		Put advisers in correct tech groups
+448		Put advisers in correct tech groups
+449		Merge bugfixesinto main
+450		Merge minor into main
+451		Merge mod into main
+452		Resolve merge issues
diff --git a/Data Files/country_mappings.txt b/Data Files/country_mappings.txt
@@ -136,7 +136,7 @@ link = { CK2 = k_nubia EU3 = NUB } # Nubia => Funj
 link = { CK2 = k_trinacria EU3 = SIC } # Trinacria => Sicily
 link = { CK2 = k_pechenegs EU3 = CRI } 
 link = { CK2 = k_magyar EU3 = HUN }
-link = { CK2 = k_moravia Eu3 = BOH }
+link = { CK2 = k_moravia EU3 = BOH }
 
 ## Duchies, Holy Orders, and Mercenaries
 # European Duchies

diff --git a/Source/CK2World/CK2Character.cpp b/Source/CK2World/CK2Character.cpp
@@ -188,7 +188,7 @@ CK2Character::CK2Character(Object* obj, const map<int, CK2Dynasty*>& dynasties,
 	{
 		hostNum = -1;
 	}
-	locationNum				= -1;
+	locationNum				= -2;
 	capitalString			= "";
 	primaryTitleString		= "";
 	vector<Object*> demesneObj = obj->getValue("demesne");

diff --git a/Source/EU3World/EU3Advisor.cpp b/Source/EU3World/EU3Advisor.cpp
@@ -47,6 +47,7 @@ EU3Advisor::EU3Advisor(Object* advisorObj, const map<int, EU3Province*>& provinc
 	}
 	else
 	{
+		home = NULL;
 		log("\tError: Trying to place %s %s in province %d, but it is not a valid province.\n", name.c_str(), dynasty.c_str(), location);
 	}
 
@@ -176,7 +177,7 @@ EU3Advisor::EU3Advisor(CK2Character* src, const inverseProvinceMapping& inverseP
 	if (advisorSkill > 6)
 		advisorSkill = 6;
 
-	if (src->getLocationNum() != -1)
+	if (src->getLocationNum() != -2)
 	{
 		inverseProvinceMapping::const_iterator mapItr = inverseProvinceMap.find(src->getLocationNum());
 		if (mapItr != inverseProvinceMap.end())
@@ -204,6 +205,7 @@ EU3Advisor::EU3Advisor(CK2Character* src, const inverseProvinceMapping& inverseP
 		}
 		else
 		{
+			home = NULL;
 			log("\tError: Trying to place %s %s in province %d, but it is not a valid province.\n", name.c_str(), dynasty.c_str(), location);
 		}
 	}

diff --git a/Source/EU3World/EU3World.cpp b/Source/EU3World/EU3World.cpp
@@ -1806,7 +1806,7 @@ int EU3World::matchTags(Object* rulesObj, vector<string>& blockedNations, const
 			}
 			else
 			{
-				log("Warning: unknown data while mapping countries.\n");
+				log("Warning: unknown data while mapping countries: %s.\n", rule[j]->getKey().c_str());
 			}
 		}
 

diff --git a/TestConfigurations/Mod/configuration.txt b/TestConfigurations/Mod/configuration.txt
@@ -9,7 +9,7 @@ configuration =
 
 	### Mod Options
 
-	# useConverterMod: wheter or not to use the converter mod. Options are:
+	# useConverterMod: whether or not to use the converter mod. Options are:
 	#	"yes"
 	#	"no"
 	useConverterMod = "yes"
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     			else
     			{
-    				log("Warning: unknown data while mapping countries.\n");
+    				log("Warning: unknown data while mapping countries: %s.\n", rule[j]->getKey().c_str());
     			}
     		}
@@ Expand Down @@