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:
@@ -77,7 +77,7 @@ bool Mushroom::growTree(Level *level, int x, int y, int z, Random *random)
|
||||
int data = level->getData(x, y, z);
|
||||
|
||||
level->removeTile(x, y, z);
|
||||
Feature *f = NULL;
|
||||
Feature *f = nullptr;
|
||||
|
||||
if (id == Tile::mushroom_brown_Id)
|
||||
{
|
||||
@@ -88,14 +88,14 @@ bool Mushroom::growTree(Level *level, int x, int y, int z, Random *random)
|
||||
f = new HugeMushroomFeature(1);
|
||||
}
|
||||
|
||||
if (f == NULL || !f->place(level, random, x, y, z))
|
||||
if (f == nullptr || !f->place(level, random, x, y, z))
|
||||
{
|
||||
level->setTileAndData(x, y, z, id, data, Tile::UPDATE_ALL);
|
||||
if( f != NULL )
|
||||
if( f != nullptr )
|
||||
delete f;
|
||||
return false;
|
||||
}
|
||||
if( f != NULL )
|
||||
if( f != nullptr )
|
||||
delete f;
|
||||
return true;
|
||||
}
|
||||
Reference in New Issue
Block a user