Merge pull request OpenXcom#1016 from winterheart/custom-fonts-mod

Externalize fonts via modding (second try)

Author: Warboy1982

bin/standard/xcom1/font.rul

@@ -0,0 +1,2 @@
+fontName: Font.dat
+

bin/standard/xcom2/font.rul

@@ -0,0 +1,2 @@
+fontName: Font.dat
+

src/Resource/XcomResourcePack.cpp

@@ -213,7 +213,9 @@ XcomResourcePack::XcomResourcePack(Ruleset *rules) : ResourcePack()
 	}
 
 	// Load fonts
-	YAML::Node doc = YAML::LoadFile(FileMap::getFilePath("Language/Font.dat"));
+	std::string fontname = rules->getFontName();
+	YAML::Node doc = YAML::LoadFile(FileMap::getFilePath("Language/" + fontname));
+	Log(LOG_INFO) << "Loading font... " << fontname;
 	Font::setIndex(Language::utf8ToWstr(doc["chars"].as<std::string>()));
 	for (YAML::const_iterator i = doc["fonts"].begin(); i != doc["fonts"].end(); ++i)
 	{

src/Ruleset/Ruleset.cpp

@@ -506,6 +506,7 @@ void Ruleset::loadFile(const std::string &filename, size_t spriteOffset)
 	_timePersonnel = doc["timePersonnel"].as<int>(_timePersonnel);
 	_initialFunding = doc["initialFunding"].as<int>(_initialFunding);
 	_alienFuel = doc["alienFuel"].as<std::string>(_alienFuel);
+	_fontName = doc["fontName"].as<std::string>(_fontName);
 	_turnAIUseGrenade = doc["turnAIUseGrenade"].as<int>(_turnAIUseGrenade);
 	_turnAIUseBlaster = doc["turnAIUseBlaster"].as<int>(_turnAIUseBlaster);
 	for (YAML::const_iterator i = doc["ufoTrajectories"].begin(); i != doc["ufoTrajectories"].end(); ++i)
@@ -1578,6 +1579,15 @@ const std::string Ruleset::getAlienFuel() const
 	return _alienFuel;
 }
 
+/**
+ * Gets name of font collection.
+ * @return the name of YAML-file with font data
+ */
+const std::string Ruleset::getFontName() const
+{
+	return _fontName;
+}
+
 /**
  * Returns the minimum facilitie's radar range.
  * @return The minimum range.

src/Ruleset/Ruleset.h

@@ -110,6 +110,7 @@ class Ruleset
 	RuleGlobe *_globe;
 	int _costSoldier, _costEngineer, _costScientist, _timePersonnel, _initialFunding, _turnAIUseGrenade, _turnAIUseBlaster;
 	std::string _alienFuel;
+	std::string _fontName;
 	YAML::Node _startingBase;
 	GameTime _startingTime;
 	std::vector<std::string> _countriesIndex, _regionsIndex, _facilitiesIndex, _craftsIndex, _craftWeaponsIndex, _itemsIndex, _invsIndex, _ufosIndex;
@@ -248,6 +249,8 @@ class Ruleset
 	Soldier *genSoldier(SavedGame *save) const;
 	/// Gets the item to be used as fuel for ships.
 	const std::string getAlienFuel() const;
+	/// Gets the font name.
+	const std::string getFontName() const;
 	/// Gets first turn when AI can use grenade.
 	int getTurnAIUseGrenade() const {return _turnAIUseGrenade;}
 	/// Gets first turn when AI can use Blaster launcher.