Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
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] != NULL && (chunks[slot]->isAt(x, z));
|
||||
return chunks[slot] != nullptr && (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 == NULL)
|
||||
if (newChunk == nullptr)
|
||||
{
|
||||
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 NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
TilePos *ReadOnlyChunkCache::findNearestMapFeature(Level *level, const wstring& featureName, int x, int y, int z)
|
||||
{
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user