1
0

Merge remote-tracking branch 'origin/master' into portals

This commit is contained in:
Tiger Wang
2014-06-04 13:14:38 +01:00
130 changed files with 22645 additions and 1193 deletions

View File

@@ -212,7 +212,7 @@ void cBioGenCache::InitializeBiomeGen(cIniFile & a_IniFile)
void cBiomeGenList::InitializeBiomes(const AString & a_Biomes)
{
AStringVector Split = StringSplit(a_Biomes, ",");
AStringVector Split = StringSplitAndTrim(a_Biomes, ",");
// Convert each string in the list into biome:
for (AStringVector::const_iterator itr = Split.begin(); itr != Split.end(); ++itr)