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:
@@ -235,7 +235,7 @@ bool ComparatorTile::triggerEvent(Level *level, int x, int y, int z, int b0, int
|
||||
{
|
||||
DiodeTile::triggerEvent(level, x, y, z, b0, b1);
|
||||
shared_ptr<TileEntity> te = level->getTileEntity(x, y, z);
|
||||
if (te != NULL)
|
||||
if (te != nullptr)
|
||||
{
|
||||
return te->triggerEvent(b0, b1);
|
||||
}
|
||||
@@ -244,7 +244,7 @@ bool ComparatorTile::triggerEvent(Level *level, int x, int y, int z, int b0, int
|
||||
|
||||
shared_ptr<TileEntity> ComparatorTile::newTileEntity(Level *level)
|
||||
{
|
||||
return shared_ptr<ComparatorTileEntity>( new ComparatorTileEntity() );
|
||||
return std::make_shared<ComparatorTileEntity>();
|
||||
}
|
||||
|
||||
bool ComparatorTile::TestUse()
|
||||
|
||||
Reference in New Issue
Block a user