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:
@@ -17,7 +17,7 @@ bool AgableMob::mobInteract(shared_ptr<Player> player)
|
||||
{
|
||||
shared_ptr<ItemInstance> item = player->inventory->getSelected();
|
||||
|
||||
if (item != NULL && item->id == Item::spawnEgg_Id)
|
||||
if (item != nullptr && item->id == Item::spawnEgg_Id)
|
||||
{
|
||||
if (!level->isClientSide)
|
||||
{
|
||||
@@ -27,10 +27,10 @@ bool AgableMob::mobInteract(shared_ptr<Player> player)
|
||||
int error;
|
||||
shared_ptr<Entity> result = SpawnEggItem::canSpawn(item->getAuxValue(), level, &error);
|
||||
|
||||
if (result != NULL)
|
||||
if (result != nullptr)
|
||||
{
|
||||
shared_ptr<AgableMob> offspring = getBreedOffspring(dynamic_pointer_cast<AgableMob>(shared_from_this()));
|
||||
if (offspring != NULL)
|
||||
if (offspring != nullptr)
|
||||
{
|
||||
offspring->setAge(BABY_START_AGE);
|
||||
offspring->moveTo(x, y, z, 0, 0);
|
||||
|
||||
Reference in New Issue
Block a user