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

QtBiomeVisualiser: Fixed compilation on Linux.

Browse Source
This commit is contained in:
Mattes D 2014-10-28 15:44:58 +01:00
parent 2d7cbfe620
commit d6c663cbc5
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/QtBiomeVisualiser/ChunkCache.cpp
View File

@ -37,14 +37,14 @@ ChunkPtr ChunkCache::fetch(int a_ChunkX, int a_ChunkZ)
// If the chunk is in cache but not valid, it means it has been already queued for rendering, do nothing now: // If the chunk is in cache but not valid, it means it has been already queued for rendering, do nothing now:
if (res != nullptr) if (res != nullptr)
{ {
return ChunkPtr(nullptr); return ChunkPtr();
} }
// There's no such item in the cache, create it now: // There's no such item in the cache, create it now:
res = new ChunkPtr(new Chunk); res = new ChunkPtr(new Chunk);
if (res == nullptr) if (res == nullptr)
{ {
return ChunkPtr(nullptr); return ChunkPtr();
} }
{ {
QMutexLocker lock(&m_Mtx); QMutexLocker lock(&m_Mtx);
@ -55,7 +55,7 @@ ChunkPtr ChunkCache::fetch(int a_ChunkX, int a_ChunkZ)
queueChunkRender(a_ChunkX, a_ChunkZ, *res); queueChunkRender(a_ChunkX, a_ChunkZ, *res);
// Return failure, the chunk is not yet rendered: // Return failure, the chunk is not yet rendered:
return ChunkPtr(nullptr); return ChunkPtr();
} }

9
Tools/QtBiomeVisualiser/ChunkLoader.h
View File

@ -7,6 +7,15 @@
#if (!defined(_MSC_VER) && (__cplusplus < 201103L))
// GCC in non-c++11 mode doesn't have the "override" keyword
#define override
#endif
// fwd: // fwd:
class Chunk; class Chunk;
typedef std::shared_ptr<Chunk> ChunkPtr; typedef std::shared_ptr<Chunk> ChunkPtr;

2
Tools/QtBiomeVisualiser/ChunkSource.cpp
View File

@ -260,7 +260,7 @@ AnvilSource::AnvilFilePtr AnvilSource::getAnvilFile(int a_ChunkX, int a_ChunkZ)
// Search the cache for the file: // Search the cache for the file:
QMutexLocker lock(&m_Mtx); QMutexLocker lock(&m_Mtx);
for (auto itr = m_Files.cbegin(), end = m_Files.cend(); itr != end; ++itr) for (auto itr = m_Files.begin(), end = m_Files.end(); itr != end; ++itr)
{ {
if (((*itr)->m_RegionX == RegionX) && ((*itr)->m_RegionZ == RegionZ)) if (((*itr)->m_RegionX == RegionX) && ((*itr)->m_RegionZ == RegionZ))
{ {

2
Tools/QtBiomeVisualiser/ChunkSource.h
View File

@ -10,7 +10,7 @@
// fwd: // fwd:
class cBiomeGen; class cBiomeGen;
typedef std::shared_ptr<cBiomeGen> cBiomeGenPtr; typedef SharedPtr<cBiomeGen> cBiomeGenPtr;
class cIniFile; class cIniFile;
typedef std::shared_ptr<cIniFile> cIniFilePtr; typedef std::shared_ptr<cIniFile> cIniFilePtr;