Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -25,7 +25,7 @@ ReadOnlyChunkCache::~ReadOnlyChunkCache()
|
||||
bool ReadOnlyChunkCache::hasChunk(int x, int z)
|
||||
{
|
||||
int slot = (x & LEN_MASK) | ((z & LEN_MASK) * LEN);
|
||||
return chunks[slot] != nullptr && (chunks[slot]->isAt(x, z));
|
||||
return chunks[slot] != NULL && (chunks[slot]->isAt(x, z));
|
||||
}
|
||||
|
||||
LevelChunk *ReadOnlyChunkCache::create(int x, int z)
|
||||
@@ -41,7 +41,7 @@ LevelChunk *ReadOnlyChunkCache::getChunk(int x, int z)
|
||||
if (!hasChunk(x, z))
|
||||
{
|
||||
LevelChunk *newChunk = load(x, z);
|
||||
if (newChunk == nullptr)
|
||||
if (newChunk == NULL)
|
||||
{
|
||||
newChunk = new EmptyLevelChunk(level, emptyPixels, x, z);
|
||||
}
|
||||
@@ -91,10 +91,10 @@ wstring ReadOnlyChunkCache::gatherStats()
|
||||
|
||||
vector<Biome::MobSpawnerData *> *ReadOnlyChunkCache::getMobsAt(MobCategory *mobCategory, int x, int y, int z)
|
||||
{
|
||||
return nullptr;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
TilePos *ReadOnlyChunkCache::findNearestMapFeature(Level *level, const wstring& featureName, int x, int y, int z)
|
||||
{
|
||||
return nullptr;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user