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:
@@ -14,8 +14,8 @@ EnchantmentTableTile::EnchantmentTableTile(int id) : BaseEntityTile(id, Material
|
||||
updateDefaultShape();
|
||||
setLightBlock(0);
|
||||
|
||||
iconTop = NULL;
|
||||
iconBottom = NULL;
|
||||
iconTop = nullptr;
|
||||
iconBottom = nullptr;
|
||||
}
|
||||
|
||||
// 4J Added override
|
||||
@@ -69,7 +69,7 @@ Icon *EnchantmentTableTile::getTexture(int face, int data)
|
||||
|
||||
shared_ptr<TileEntity> EnchantmentTableTile::newTileEntity(Level *level)
|
||||
{
|
||||
return shared_ptr<TileEntity>(new EnchantmentTableEntity());
|
||||
return std::make_shared<EnchantmentTableEntity>();
|
||||
}
|
||||
|
||||
bool EnchantmentTableTile::use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param
|
||||
|
||||
Reference in New Issue
Block a user