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:
@@ -20,14 +20,14 @@ BegGoal::BegGoal(Wolf *wolf, float lookDistance)
|
||||
bool BegGoal::canUse()
|
||||
{
|
||||
player = weak_ptr<Player>(level->getNearestPlayer(wolf->shared_from_this(), lookDistance));
|
||||
if (player.lock() == NULL) return false;
|
||||
if (player.lock() == nullptr) return false;
|
||||
wolf->setDespawnProtected();
|
||||
return playerHoldingInteresting(player.lock());
|
||||
}
|
||||
|
||||
bool BegGoal::canContinueToUse()
|
||||
{
|
||||
if (player.lock() == NULL || !player.lock()->isAlive()) return false;
|
||||
if (player.lock() == nullptr || !player.lock()->isAlive()) return false;
|
||||
if (wolf->distanceToSqr(player.lock()) > lookDistance * lookDistance) return false;
|
||||
wolf->setDespawnProtected();
|
||||
return lookTime > 0 && playerHoldingInteresting(player.lock());
|
||||
@@ -54,7 +54,7 @@ void BegGoal::tick()
|
||||
bool BegGoal::playerHoldingInteresting(shared_ptr<Player> player)
|
||||
{
|
||||
shared_ptr<ItemInstance> item = player->inventory->getSelected();
|
||||
if (item == NULL) return false;
|
||||
if (item == nullptr) return false;
|
||||
if (!wolf->isTame() && item->id == Item::bone_Id) return true;
|
||||
return wolf->isFood(item);
|
||||
}
|
||||
Reference in New Issue
Block a user