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:
@@ -16,7 +16,7 @@ SwellGoal::SwellGoal(Creeper *creeper)
|
||||
bool SwellGoal::canUse()
|
||||
{
|
||||
shared_ptr<LivingEntity> target = creeper->getTarget();
|
||||
return creeper->getSwellDir() > 0 || (target != NULL && (creeper->distanceToSqr(target) < 3 * 3));
|
||||
return creeper->getSwellDir() > 0 || (target != nullptr && (creeper->distanceToSqr(target) < 3 * 3));
|
||||
}
|
||||
|
||||
void SwellGoal::start()
|
||||
@@ -32,7 +32,7 @@ void SwellGoal::stop()
|
||||
|
||||
void SwellGoal::tick()
|
||||
{
|
||||
if (target.lock() == NULL)
|
||||
if (target.lock() == nullptr)
|
||||
{
|
||||
creeper->setSwellDir(-1);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user