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:
@@ -19,7 +19,7 @@ shared_ptr<ItemInstance> EnderpearlItem::use(shared_ptr<ItemInstance> instance,
|
||||
{
|
||||
// 4J-PB - Not sure why this was disabled for creative mode, so commenting out
|
||||
//if (player->abilities.instabuild) return instance;
|
||||
if (player->riding != NULL) return instance;
|
||||
if (player->riding != nullptr) return instance;
|
||||
if (!player->abilities.instabuild)
|
||||
{
|
||||
instance->count--;
|
||||
@@ -28,7 +28,7 @@ shared_ptr<ItemInstance> EnderpearlItem::use(shared_ptr<ItemInstance> instance,
|
||||
level->playEntitySound(player, eSoundType_RANDOM_BOW, 0.5f, 0.4f / (random->nextFloat() * 0.4f + 0.8f));
|
||||
if (!level->isClientSide)
|
||||
{
|
||||
level->addEntity( shared_ptr<ThrownEnderpearl>( new ThrownEnderpearl(level, player) ) );
|
||||
level->addEntity(std::make_shared<ThrownEnderpearl>(level, player));
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
Reference in New Issue
Block a user