Merge pull request OpenXcom#1020 from myk002/soldier_name_rules

Read soldier name files from ruleset

Author: Warboy1982

bin/common/Ruleset/soldierNames.rul

@@ -0,0 +1,4 @@
+# pull in all *.nam files in the SoldierName virtual directory by default
+# mods can override with specific files if desired
+soldierNames:
+  - SoldierName/

src/Engine/Options.cpp

@@ -727,7 +727,7 @@ void mapResources()
 		_loadMod(modInfo, circDepCheck);
 	}
 	// pick up stuff in common
-	FileMap::load("", CrossPlatform::searchDataFolder("common"), true);
+	FileMap::load("common", CrossPlatform::searchDataFolder("common"), false);
 }
 
 /**

src/Ruleset/Ruleset.cpp

@@ -136,14 +136,6 @@ void Ruleset::resetGlobalStatics()
 Ruleset::Ruleset() : _costSoldier(0), _costEngineer(0), _costScientist(0), _timePersonnel(0), _initialFunding(0), _turnAIUseGrenade(3), _turnAIUseBlaster(3), _startingTime(6, 1, 1, 1999, 12, 0, 0), _facilityListOrder(0), _craftListOrder(0), _itemListOrder(0), _researchListOrder(0),  _manufactureListOrder(0), _ufopaediaListOrder(0), _invListOrder(0)
 {
 	_globe = new RuleGlobe();
-
-	std::set<std::string> names = FileMap::filterFiles(FileMap::getVFolderContents("SoldierName"), "nam");
-	for (std::set<std::string>::iterator i = names.begin(); i != names.end(); ++i)
-	{
-		SoldierNamePool *pool = new SoldierNamePool();
-		pool->load(FileMap::getFilePath("SoldierName/" + *i));
-		_names.push_back(pool);
-	}
 }
 
 /**
@@ -378,6 +370,7 @@ void Ruleset::loadFile(const std::string &filename, size_t spriteOffset)
 			rule->load(*i);
 		}
 	}
+	_soldierNames = doc["soldierNames"].as<std::vector<std::string> >(_soldierNames);
 	for (YAML::const_iterator i = doc["soldiers"].begin(); i != doc["soldiers"].end(); ++i)
 	{
 		RuleSoldier *rule = loadRule(*i, &_soldiers);
@@ -1502,6 +1495,13 @@ struct compareRule<ArticleDefinition> : public std::binary_function<const std::s
 };
 std::map<std::string, int> compareRule<ArticleDefinition>::_sections;
 
+static void addSoldierNamePool(std::vector<SoldierNamePool*> &names, const std::string &namFile)
+{
+	SoldierNamePool *pool = new SoldierNamePool();
+	pool->load(FileMap::getFilePath(namFile));
+	names.push_back(pool);
+}
+
 /**
  * Sorts all our lists according to their weight.
  */
@@ -1517,6 +1517,24 @@ void Ruleset::sortLists()
 	std::sort(_craftWeaponsIndex.begin(), _craftWeaponsIndex.end(), compareRule<RuleCraftWeapon>(this));
 	std::sort(_armorsIndex.begin(), _armorsIndex.end(), compareRule<Armor>(this));
 	std::sort(_ufopaediaIndex.begin(), _ufopaediaIndex.end(), compareRule<ArticleDefinition>(this));
+
+	for (std::vector<std::string>::iterator i = _soldierNames.begin(); i != _soldierNames.end(); ++i)
+	{
+		if (i->substr(i->length() - 1, 1) == "/")
+		{
+			// load all *.nam files in given directory
+			std::set<std::string> names = FileMap::filterFiles(FileMap::getVFolderContents(*i), "nam");
+			for (std::set<std::string>::iterator j = names.begin(); j != names.end(); ++j)
+			{
+				addSoldierNamePool(_names, *i + *j);
+			}
+		}
+		else
+		{
+			// load given file
+			addSoldierNamePool(_names, *i);
+		}
+	}
 }
 
 /**

src/Ruleset/Ruleset.h

@@ -76,6 +76,7 @@ class RuleMusic;
 class Ruleset
 {
 protected:
+	std::vector<std::string> _soldierNames;
 	std::vector<SoldierNamePool*> _names;
 	std::map<std::string, RuleCountry*> _countries;
 	std::map<std::string, RuleRegion*> _regions;