Merge pull request #1576 from vcmi/fix-campaigns

Hack to fix campaigns

lib/VCMI_Lib.cpp

@@ -246,7 +246,6 @@ void LibClasses::init(bool onlyEssential)
 
 void LibClasses::clear()
 {
-	delete generaltexth;
 	delete heroh;
 	delete arth;
 	delete creh;
@@ -263,6 +262,7 @@ void LibClasses::clear()
 	delete scriptHandler;
 #endif
 	delete battlefieldsHandler;
+	delete generaltexth;
 	makeNull();
 }
 

lib/mapObjects/CGHeroInstance.cpp

@@ -1621,6 +1621,13 @@ void CGHeroInstance::serializeJsonOptions(JsonSerializeFormat & handler)
 
 		if(!handler.saving)
 		{
+			if(!appearance)
+			{
+				// crossoverDeserialize
+				type = VLC->heroh->objects[subID];
+				appearance = VLC->objtypeh->getHandlerFor(Obj::HERO, type->heroClass->getIndex())->getTemplates().front();
+			}
+
 			patrol.patrolling = (rawPatrolRadius > NO_PATROLING);
 			patrol.initialPos = visitablePos();
 			patrol.patrolRadius = (rawPatrolRadius > NO_PATROLING) ? rawPatrolRadius : 0;