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:
@@ -40,7 +40,7 @@ RangedAttackGoal::RangedAttackGoal(RangedAttackMob *rangedMob, Mob *mob, double
|
||||
bool RangedAttackGoal::canUse()
|
||||
{
|
||||
shared_ptr<LivingEntity> bestTarget = mob->getTarget();
|
||||
if (bestTarget == NULL) return false;
|
||||
if (bestTarget == nullptr) return false;
|
||||
target = weak_ptr<LivingEntity>(bestTarget);
|
||||
return true;
|
||||
}
|
||||
@@ -60,7 +60,7 @@ void RangedAttackGoal::stop()
|
||||
void RangedAttackGoal::tick()
|
||||
{
|
||||
// 4J: It's possible the target has gone since canUse selected it, don't do tick if target is null
|
||||
if (target.lock() == NULL) return;
|
||||
if (target.lock() == nullptr) return;
|
||||
|
||||
double targetDistSqr = mob->distanceToSqr(target.lock()->x, target.lock()->bb->y0, target.lock()->z);
|
||||
bool canSee = mob->getSensing()->canSee(target.lock());
|
||||
|
||||
Reference in New Issue
Block a user