@@ -61,11 +61,12 @@ class matchById: public std::unary_function<const AlienBase *, bool>
 {
 public:
 	/// Remember ID.
-	matchById(int id) : _id(id) { /* Empty by design. */ }
+	matchById(int id, std::string type) : _id(id), _type(type) { /* Empty by design. */ }
 	/// Match with stored ID.
-	bool operator()(const AlienBase *ab) const { return ab->getId() == _id; }
+	bool operator()(const AlienBase *ab) const { return ab->getId() == _id && ab->getDeployment()->getMarkerName() == _type; }
 private:
 	int _id;
+	std::string _type;
 };
 
 /**
@@ -84,8 +85,15 @@ void AlienMission::load(const YAML::Node& node, SavedGame &game)
 	_uniqueID = node["uniqueID"].as<int>(_uniqueID);
 	if (const YAML::Node &base = node["alienBase"])
 	{
-		int id = base.as<int>();
-		std::vector<AlienBase*>::const_iterator found = std::find_if (game.getAlienBases()->begin(), game.getAlienBases()->end(), matchById(id));
+		int id = base.as<int>(-1);
+		std::string type = "STR_ALIEN_BASE";
+		// New format
+		if (id == -1)
+		{
+			id = base["id"].as<int>();
+			type = base["type"].as<std::string>();
+		}
+		std::vector<AlienBase*>::const_iterator found = std::find_if(game.getAlienBases()->begin(), game.getAlienBases()->end(), matchById(id, type));
 		if (found == game.getAlienBases()->end())
 		{
 			throw Exception("Corrupted save: Invalid base for mission.");
@@ -112,7 +120,7 @@ YAML::Node AlienMission::save() const
 	node["uniqueID"] = _uniqueID;
 	if (_base)
 	{
-		node["alienBase"] = _base->getId();
+		node["alienBase"] = _base->saveId();
 	}
 	node["missionSiteZone"] = _missionSiteZone;
 	return node;
 
@@ -179,28 +179,26 @@ void Craft::load(const YAML::Node &node, const Mod *mod, SavedGame *save)
 				}
 			}
 		}
-		else if (type == "STR_ALIEN_BASE")
+		else
 		{
-			for (std::vector<AlienBase*>::iterator i = save->getAlienBases()->begin(); i != save->getAlienBases()->end(); ++i)
+			// Backwards compatibility
+			if (type == "STR_ALIEN_TERROR")
+				type = "STR_TERROR_SITE";
+			bool found = false;
+			for (std::vector<MissionSite*>::iterator i = save->getMissionSites()->begin(); i != save->getMissionSites()->end() && !found; ++i)
 			{
-				if ((*i)->getId() == id)
+				if ((*i)->getId() == id && (*i)->getDeployment()->getMarkerName() == type)
 				{
 					setDestination(*i);
-					break;
+					found = true;
 				}
 			}
-		}
-		else
-		{
-			// Backwards compatibility
-			if (type == "STR_ALIEN_TERROR")
-				type = "STR_TERROR_SITE";
-			for (std::vector<MissionSite*>::iterator i = save->getMissionSites()->begin(); i != save->getMissionSites()->end(); ++i)
+			for (std::vector<AlienBase*>::iterator i = save->getAlienBases()->begin(); i != save->getAlienBases()->end() && !found; ++i)
 			{
 				if ((*i)->getId() == id && (*i)->getDeployment()->getMarkerName() == type)
 				{
 					setDestination(*i);
-					break;
+					found = true;
 				}
 			}
 		}
Original file line number	Diff line number	Diff line change
`@@ -179,28 +179,26 @@ void Craft::load(const YAML::Node &node, const Mod mod, SavedGame save)`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`}`
`182`		`- else if (type == "STR_ALIEN_BASE")`
	`182`	`+ else`
`183`	`183`	`{`
`184`		`- for (std::vector<AlienBase*>::iterator i = save->getAlienBases()->begin(); i != save->getAlienBases()->end(); ++i)`
	`184`	`+ // Backwards compatibility`
	`185`	`+ if (type == "STR_ALIEN_TERROR")`
	`186`	`+ type = "STR_TERROR_SITE";`
	`187`	`+ bool found = false;`
	`188`	`+ for (std::vector<MissionSite*>::iterator i = save->getMissionSites()->begin(); i != save->getMissionSites()->end() && !found; ++i)`
`185`	`189`	`{`
`186`		`- if ((*i)->getId() == id)`
	`190`	`+ if ((i)->getId() == id && (i)->getDeployment()->getMarkerName() == type)`
`187`	`191`	`{`
`188`	`192`	`setDestination(*i);`
`189`		`- break;`
	`193`	`+ found = true;`
`190`	`194`	`}`
`191`	`195`	`}`
`192`		`- }`
`193`		`- else`
`194`		`- {`
`195`		`- // Backwards compatibility`
`196`		`- if (type == "STR_ALIEN_TERROR")`
`197`		`- type = "STR_TERROR_SITE";`
`198`		`- for (std::vector<MissionSite*>::iterator i = save->getMissionSites()->begin(); i != save->getMissionSites()->end(); ++i)`
	`196`	`+ for (std::vector<AlienBase*>::iterator i = save->getAlienBases()->begin(); i != save->getAlienBases()->end() && !found; ++i)`
`199`	`197`	`{`
`200`	`198`	`if ((i)->getId() == id && (i)->getDeployment()->getMarkerName() == type)`
`201`	`199`	`{`
`202`	`200`	`setDestination(*i);`
`203`		`- break;`
	`201`	`+ found = true;`
`204`	`202`	`}`
`205`	`203`	`}`
`206`	`204`	`}`