Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- slight change in loading factiontype (load by folder names not *. to avoid errors when garbage files exist)

Browse Source
This commit is contained in:
Mark Vejvoda 2011-06-29 06:42:49 +00:00
parent 8bbf398e70
commit 4e4825d752
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/glest_game/types/faction_type.cpp
View File

@ -56,9 +56,12 @@ void FactionType::load(const string &dir, const TechTree *techTree, Checksum* ch
if(personalityType == fpt_Normal) {
// a1) preload units
string unitsPath= currentPath + "units/*.";
//string unitsPath= currentPath + "units/*.";
string unitsPath= currentPath + "units/";
vector<string> unitFilenames;
findAll(unitsPath, unitFilenames);
//findAll(unitsPath, unitFilenames);
findDirs(unitsPath, unitFilenames,false,false);
unitTypes.resize(unitFilenames.size());
for(int i = 0; i < unitTypes.size(); ++i) {
@ -69,9 +72,12 @@ void FactionType::load(const string &dir, const TechTree *techTree, Checksum* ch
}
// a2) preload upgrades
string upgradesPath= currentPath + "upgrades/*.";
//string upgradesPath= currentPath + "upgrades/*.";
string upgradesPath= currentPath + "upgrades/";
vector<string> upgradeFilenames;
findAll(upgradesPath, upgradeFilenames, false, false);
//findAll(upgradesPath, upgradeFilenames, false, false);
findDirs(upgradesPath, upgradeFilenames,false,false);
upgradeTypes.resize(upgradeFilenames.size());
for(int i = 0; i < upgradeTypes.size(); ++i) {
string str= currentPath + "upgrades/" + upgradeFilenames[i];