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,7 +14,7 @@ bool OwnerHurtTargetGoal::canUse()
|
||||
{
|
||||
if (!tameAnimal->isTame()) return false;
|
||||
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tameAnimal->getOwner() );
|
||||
if (owner == NULL) return false;
|
||||
if (owner == nullptr) return false;
|
||||
ownerLastHurt = weak_ptr<LivingEntity>(owner->getLastHurtMob());
|
||||
int ts = owner->getLastHurtMobTimestamp();
|
||||
shared_ptr<LivingEntity> locked = ownerLastHurt.lock();
|
||||
@@ -26,7 +26,7 @@ void OwnerHurtTargetGoal::start()
|
||||
mob->setTarget(ownerLastHurt.lock());
|
||||
|
||||
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tameAnimal->getOwner() );
|
||||
if (owner != NULL)
|
||||
if (owner != nullptr)
|
||||
{
|
||||
timestamp = owner->getLastHurtMobTimestamp();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user