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

Fixed style.

Browse Source
This commit is contained in:
Mattes D 2014-09-05 22:07:13 +02:00
parent 6444bc25ba
commit 60e235362c
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Generating/BioGen.cpp
View File

@ -227,7 +227,7 @@ cBioGenMulticache::cBioGenMulticache(cBiomeGen * a_BioGenToCache, size_t a_Cache
cBioGenMulticache::~cBioGenMulticache() cBioGenMulticache::~cBioGenMulticache()
{ {
for (std::vector<cBiomeGen*>::iterator it = m_Caches.begin(); it != m_Caches.end(); it++) for (cBiomeGens::iterator it = m_Caches.begin(); it != m_Caches.end(); it++)
{ {
delete *it; delete *it;
} }
@ -251,7 +251,7 @@ void cBioGenMulticache::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMa
void cBioGenMulticache::InitializeBiomeGen(cIniFile & a_IniFile) void cBioGenMulticache::InitializeBiomeGen(cIniFile & a_IniFile)
{ {
for (std::vector<cBiomeGen*>::iterator it = m_Caches.begin(); it != m_Caches.end(); it++) for (cBiomeGens::iterator it = m_Caches.begin(); it != m_Caches.end(); it++)
{ {
cBiomeGen * tmp = *it; cBiomeGen * tmp = *it;
tmp->InitializeBiomeGen(a_IniFile); tmp->InitializeBiomeGen(a_IniFile);

14
src/Generating/BioGen.h
View File

@ -87,16 +87,20 @@ class cBioGenMulticache :
typedef cBiomeGen super; typedef cBiomeGen super;
public: public:
/* /*
a_CacheSize defines the size of each singular cache a_CacheSize defines the size of each singular cache
a_CachesLength defines how many caches are used for the multicache a_CachesLength defines how many caches are used for the multicache
*/ */
cBioGenMulticache(cBiomeGen * a_BioGenToCache, size_t a_CacheSize, size_t a_CachesLength); // Doesn't take ownership of a_BioGenToCache cBioGenMulticache(cBiomeGen * a_BioGenToCache, size_t a_CacheSize, size_t a_CachesLength); // Doesn't take ownership of a_BioGenToCache
~cBioGenMulticache(); ~cBioGenMulticache();
protected: protected:
size_t m_CachesLength; typedef std::vector<cBiomeGen *> cBiomeGens;
std::vector<cBiomeGen*> m_Caches;
size_t m_CachesLength;
cBiomeGens m_Caches;
virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override; virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
virtual void InitializeBiomeGen(cIniFile & a_IniFile) override; virtual void InitializeBiomeGen(cIniFile & a_IniFile) override;

4
src/Generating/ComposableGenerator.cpp
View File

@ -243,12 +243,12 @@ void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
} }
LOGD("Using a cache for biomegen of size %d.", CacheSize); LOGD("Using a cache for biomegen of size %d.", CacheSize);
m_UnderlyingBiomeGen = m_BiomeGen; m_UnderlyingBiomeGen = m_BiomeGen;
if (MultiCacheLength > 0) if (MultiCacheLength > 0)
{ {
LOGD("Enabling multicache for biomegen of length %d.", MultiCacheLength); LOGD("Enabling multicache for biomegen of length %d.", MultiCacheLength);
m_BiomeGen = new cBioGenMulticache(m_UnderlyingBiomeGen, CacheSize, MultiCacheLength); m_BiomeGen = new cBioGenMulticache(m_UnderlyingBiomeGen, CacheSize, MultiCacheLength);
} }
else else
{ {
m_BiomeGen = new cBioGenCache(m_UnderlyingBiomeGen, CacheSize); m_BiomeGen = new cBioGenCache(m_UnderlyingBiomeGen, CacheSize);
} }