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:
@@ -33,7 +33,7 @@ bool FollowParentGoal::canUse()
|
||||
}
|
||||
delete parents;
|
||||
|
||||
if (closest == nullptr) return false;
|
||||
if (closest == NULL) return false;
|
||||
if (closestDistSqr < 3 * 3) return false;
|
||||
parent = weak_ptr<Animal>(closest);
|
||||
return true;
|
||||
@@ -41,7 +41,7 @@ bool FollowParentGoal::canUse()
|
||||
|
||||
bool FollowParentGoal::canContinueToUse()
|
||||
{
|
||||
if (parent.lock() == nullptr || !parent.lock()->isAlive()) return false;
|
||||
if (parent.lock() == NULL || !parent.lock()->isAlive()) return false;
|
||||
double distSqr = animal->distanceToSqr(parent.lock());
|
||||
if (distSqr < 3 * 3 || distSqr > 16 * 16) return false;
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user