@@ -465,10 +465,10 @@ void Game::loadLanguage(const std::string &filename)
 		throw Exception(path + ": " + std::string(e.what()));
 	}
 
-	std::vector<ModInfo> activeMods = Options::getActiveMods();
-	for (std::vector<ModInfo>::const_iterator i = activeMods.begin(); i != activeMods.end(); ++i)
+	std::vector<const ModInfo*> activeMods = Options::getActiveMods();
+	for (std::vector<const ModInfo*>::const_iterator i = activeMods.begin(); i != activeMods.end(); ++i)
 	{
-		std::string file = i->getPath() + ss.str();
+		std::string file = (*i)->getPath() + ss.str();
 		if (CrossPlatform::fileExists(file))
 		{
 			_lang->load(file);
 
@@ -32,11 +32,6 @@ ModInfo::ModInfo(const std::string &path) :
 	// empty
 }
 
-ModInfo::~ModInfo()
-{
-	// empty
-}
-
 void ModInfo::load(const std::string &filename)
 {
 	YAML::Node doc = YAML::LoadFile(filename);
 
@@ -36,8 +36,6 @@ class ModInfo
 public:
 	/// Creates default metadata for a mod at the specified path.
 	ModInfo(const std::string &path);
-	/// Cleans up.
-	virtual ~ModInfo();
 	/// Loads the metadata from YAML.
 	void load(const std::string &filename);
 	/// Gets the path where this mod resides on disk.
 
@@ -1075,15 +1075,15 @@ const std::vector<OptionInfo> &getOptionInfo()
  * @sa ModInfo::canActivate
  * @return List of info for the active mods.
  */
-std::vector<ModInfo> getActiveMods()
+std::vector<const ModInfo *> getActiveMods()
 {
-	std::vector<ModInfo> activeMods;
+	std::vector<const ModInfo*> activeMods;
 	for (std::vector< std::pair<std::string, bool> >::iterator i = mods.begin(); i != mods.end(); ++i)
 	{
 		if (i->second)
 		{
-			ModInfo info = _modInfos.find(i->first)->second;
-			if (info.canActivate(_masterMod))
+			const ModInfo *info = &_modInfos.at(i->first);
+			if (info->canActivate(_masterMod))
 			{
 				activeMods.push_back(info);
 			}
 
@@ -108,7 +108,7 @@ namespace Options
 	/// Refreshes the mods and filemaps.
 	void updateMods();
 	/// Gets the list of currently active mods.
-	std::vector<ModInfo> getActiveMods();
+	std::vector<const ModInfo*> getActiveMods();
 }
 
 }
@@ -595,11 +595,11 @@ void SavedGame::save(const std::string &filename) const
 	}
 
 	// only save mods that work with the current master
-	std::vector<ModInfo> activeMods = Options::getActiveMods();
+	std::vector<const ModInfo*> activeMods = Options::getActiveMods();
 	std::vector<std::string> modsList;
-	for (std::vector<ModInfo>::const_iterator i = activeMods.begin(); i != activeMods.end(); ++i)
+	for (std::vector<const ModInfo*>::const_iterator i = activeMods.begin(); i != activeMods.end(); ++i)
 	{
-		modsList.push_back(i->getId() + " ver: " + i->getVersion());
+		modsList.push_back((*i)->getId() + " ver: " + (*i)->getVersion());
 	}
 	brief["mods"] = modsList;
 	if (_ironman)
Original file line number	Diff line number	Diff line change
`@@ -465,10 +465,10 @@ void Game::loadLanguage(const std::string &filename)`
`465`	`465`	`throw Exception(path + ": " + std::string(e.what()));`
`466`	`466`	`}`
`467`	`467`
`468`		`- std::vector<ModInfo> activeMods = Options::getActiveMods();`
`469`		`- for (std::vector<ModInfo>::const_iterator i = activeMods.begin(); i != activeMods.end(); ++i)`
	`468`	`+ std::vector<const ModInfo*> activeMods = Options::getActiveMods();`
	`469`	`+ for (std::vector<const ModInfo*>::const_iterator i = activeMods.begin(); i != activeMods.end(); ++i)`
`470`	`470`	`{`
`471`		`- std::string file = i->getPath() + ss.str();`
	`471`	`+ std::string file = (*i)->getPath() + ss.str();`
`472`	`472`	`if (CrossPlatform::fileExists(file))`
`473`	`473`	`{`
`474`	`474`	`_lang->load(file);`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,6 @@ ModInfo::ModInfo(const std::string &path) :`
`32`	`32`	`// empty`
`33`	`33`	`}`
`34`	`34`
`35`		`-ModInfo::~ModInfo()`
`36`		`-{`
`37`		`- // empty`
`38`		`-}`
`39`		`-`
`40`	`35`	`void ModInfo::load(const std::string &filename)`
`41`	`36`	`{`
`42`	`37`	`YAML::Node doc = YAML::LoadFile(filename);`
Original file line number	Diff line number	Diff line change
`@@ -1075,15 +1075,15 @@ const std::vector<OptionInfo> &getOptionInfo()`
`1075`	`1075`	`* @sa ModInfo::canActivate`
`1076`	`1076`	`* @return List of info for the active mods.`
`1077`	`1077`	`*/`
`1078`		`-std::vector<ModInfo> getActiveMods()`
	`1078`	`+std::vector<const ModInfo *> getActiveMods()`
`1079`	`1079`	`{`
`1080`		`- std::vector<ModInfo> activeMods;`
	`1080`	`+ std::vector<const ModInfo*> activeMods;`
`1081`	`1081`	`for (std::vector< std::pair<std::string, bool> >::iterator i = mods.begin(); i != mods.end(); ++i)`
`1082`	`1082`	`{`
`1083`	`1083`	`if (i->second)`
`1084`	`1084`	`{`
`1085`		`- ModInfo info = _modInfos.find(i->first)->second;`
`1086`		`- if (info.canActivate(_masterMod))`
	`1085`	`+ const ModInfo *info = &_modInfos.at(i->first);`
	`1086`	`+ if (info->canActivate(_masterMod))`
`1087`	`1087`	`{`
`1088`	`1088`	`activeMods.push_back(info);`
`1089`	`1089`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ namespace Options`
`108`	`108`	`/// Refreshes the mods and filemaps.`
`109`	`109`	`void updateMods();`
`110`	`110`	`/// Gets the list of currently active mods.`
`111`		`- std::vector<ModInfo> getActiveMods();`
	`111`	`+ std::vector<const ModInfo*> getActiveMods();`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -595,11 +595,11 @@ void SavedGame::save(const std::string &filename) const`
`595`	`595`	`}`
`596`	`596`
`597`	`597`	`// only save mods that work with the current master`
`598`		`- std::vector<ModInfo> activeMods = Options::getActiveMods();`
	`598`	`+ std::vector<const ModInfo*> activeMods = Options::getActiveMods();`
`599`	`599`	`std::vector<std::string> modsList;`
`600`		`- for (std::vector<ModInfo>::const_iterator i = activeMods.begin(); i != activeMods.end(); ++i)`
	`600`	`+ for (std::vector<const ModInfo*>::const_iterator i = activeMods.begin(); i != activeMods.end(); ++i)`
`601`	`601`	`{`
`602`		`- modsList.push_back(i->getId() + " ver: " + i->getVersion());`
	`602`	`+ modsList.push_back((i)->getId() + " ver: " + (i)->getVersion());`
`603`	`603`	`}`
`604`	`604`	`brief["mods"] = modsList;`
`605`	`605`	`if (_ironman)`