Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
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 == nullptr) return false;
|
||||
if (owner == NULL) 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() != nullptr && !navigation->isDone() && tamable->distanceToSqr(owner.lock()) > stopDistance * stopDistance && !tamable->isSitting();
|
||||
return owner.lock() != NULL && !navigation->isDone() && tamable->distanceToSqr(owner.lock()) > stopDistance * stopDistance && !tamable->isSitting();
|
||||
}
|
||||
|
||||
void FollowOwnerGoal::start()
|
||||
|
||||
Reference in New Issue
Block a user