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:
@@ -29,7 +29,7 @@ bool LookAtPlayerGoal::canUse()
|
||||
{
|
||||
if (mob->getRandom()->nextFloat() >= probability) return false;
|
||||
|
||||
if (mob->getTarget() != NULL)
|
||||
if (mob->getTarget() != nullptr)
|
||||
{
|
||||
lookAt = mob->getTarget();
|
||||
}
|
||||
@@ -41,12 +41,12 @@ bool LookAtPlayerGoal::canUse()
|
||||
{
|
||||
lookAt = weak_ptr<Entity>(mob->level->getClosestEntityOfClass(lookAtType, mob->bb->grow(lookDistance, 3, lookDistance), mob->shared_from_this()));
|
||||
}
|
||||
return lookAt.lock() != NULL;
|
||||
return lookAt.lock() != nullptr;
|
||||
}
|
||||
|
||||
bool LookAtPlayerGoal::canContinueToUse()
|
||||
{
|
||||
if (lookAt.lock() == NULL || !lookAt.lock()->isAlive()) return false;
|
||||
if (lookAt.lock() == nullptr || !lookAt.lock()->isAlive()) return false;
|
||||
if (mob->distanceToSqr(lookAt.lock()) > lookDistance * lookDistance) return false;
|
||||
return lookTime > 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user