flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

BiomeMultiCache is not used for simple generators.

Browse Source
This commit is contained in:
Mattes D 2014-09-05 22:08:00 +02:00
parent 60e235362c
commit e15b8600a6
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Generating/ComposableGenerator.cpp
View File

@ -230,29 +230,30 @@ void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
// Add a cache, if requested: // Add a cache, if requested:
int CacheSize = a_IniFile.GetValueSetI("Generator", "BiomeGenCacheSize", CacheOffByDefault ? 0 : 64); int CacheSize = a_IniFile.GetValueSetI("Generator", "BiomeGenCacheSize", CacheOffByDefault ? 0 : 64);
int MultiCacheLength = a_IniFile.GetValueSetI("Generator", "BiomeGenMultiCacheLength", 4);
if (CacheSize > 0) if (CacheSize <= 0)
{ {
if (CacheSize < 4) return;
{ }
LOGWARNING("Biomegen cache size set too low, would hurt performance instead of helping. Increasing from %d to %d",
CacheSize, 4 int MultiCacheLength = a_IniFile.GetValueSetI("Generator", "BiomeGenMultiCacheLength", 4);
); if (CacheSize < 4)
CacheSize = 4; {
} LOGWARNING("Biomegen cache size set too low, would hurt performance instead of helping. Increasing from %d to %d",
LOGD("Using a cache for biomegen of size %d.", CacheSize); CacheSize, 4
m_UnderlyingBiomeGen = m_BiomeGen; );
if (MultiCacheLength > 0) CacheSize = 4;
{ }
LOGD("Enabling multicache for biomegen of length %d.", MultiCacheLength); LOGD("Using a cache for biomegen of size %d.", CacheSize);
m_BiomeGen = new cBioGenMulticache(m_UnderlyingBiomeGen, CacheSize, MultiCacheLength); m_UnderlyingBiomeGen = m_BiomeGen;
} if (MultiCacheLength > 0)
else {
{ LOGD("Enabling multicache for biomegen of length %d.", MultiCacheLength);
m_BiomeGen = new cBioGenCache(m_UnderlyingBiomeGen, CacheSize); m_BiomeGen = new cBioGenMulticache(m_UnderlyingBiomeGen, CacheSize, MultiCacheLength);
} }
else
{
m_BiomeGen = new cBioGenCache(m_UnderlyingBiomeGen, CacheSize);
} }
} }