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:
@@ -25,7 +25,7 @@ FollowOwnerGoal::FollowOwnerGoal(TamableAnimal *tamable, double speedModifier, f
|
||||
bool FollowOwnerGoal::canUse()
|
||||
{
|
||||
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tamable->getOwner() );
|
||||
if (owner == NULL) return false;
|
||||
if (owner == nullptr) return false;
|
||||
if (tamable->isSitting()) return false;
|
||||
if (tamable->distanceToSqr(owner) < startDistance * startDistance) return false;
|
||||
this->owner = weak_ptr<LivingEntity>(owner);
|
||||
@@ -34,7 +34,7 @@ bool FollowOwnerGoal::canUse()
|
||||
|
||||
bool FollowOwnerGoal::canContinueToUse()
|
||||
{
|
||||
return owner.lock() != NULL && !navigation->isDone() && tamable->distanceToSqr(owner.lock()) > stopDistance * stopDistance && !tamable->isSitting();
|
||||
return owner.lock() != nullptr && !navigation->isDone() && tamable->distanceToSqr(owner.lock()) > stopDistance * stopDistance && !tamable->isSitting();
|
||||
}
|
||||
|
||||
void FollowOwnerGoal::start()
|
||||
|
||||
Reference in New Issue
Block a user