Add some error handling for setting de jure lieges, and prevent crashes.

ParadoxGameConverters · Mar 4, 2013 · 8e1bab5 · 8e1bab5
1 parent 3784c31
commit 8e1bab5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Source/CK2World/CK2Title.cpp b/Source/CK2World/CK2Title.cpp
@@ -259,6 +259,10 @@ void CK2Title::setDeJureLiege(const map<string, CK2Title*>& titles)
 			deJureLiege = titleItr->second;
 			deJureLiege->addDeJureVassal(this);
 		}
+		else
+		{
+			log("Error: Could not find de jure liege %s for %s.\n", deJureLiegeString.c_str(), titleString.c_str());
+		}
 	}
 }
 

diff --git a/Source/CK2World/CK2World.cpp b/Source/CK2World/CK2World.cpp
@@ -237,7 +237,14 @@ void CK2World::init(Object* obj, const cultureGroupMapping& cultureGroupMap)
 	{
 		if (titleItr->first.substr(0, 1) == "b")
 		{
-			titleItr->second->setLiege(titleItr->second->getDeJureLiege());
+			if (titleItr->second->getDeJureLiege())
+			{
+				titleItr->second->setLiege(titleItr->second->getDeJureLiege());
+			}
+			else
+			{
+				log("Error: barony %s is independent and has no de jure liege.\n", titleItr->first.c_str());
+			}
 		}
 		else
 		{
-Original file line number
+Diff line change
@@ Expand Up @@
     			deJureLiege = titleItr->second;
     			deJureLiege->addDeJureVassal(this);
     		}
+    		else
+    		{
+    			log("Error: Could not find de jure liege %s for %s.\n", deJureLiegeString.c_str(), titleString.c_str());
+    		}
     	}
     }
@@ Expand Down @@