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:
@@ -53,12 +53,12 @@ bool TakeFlowerGoal::canUse()
|
||||
|
||||
bool TakeFlowerGoal::canContinueToUse()
|
||||
{
|
||||
return golem.lock() != NULL && golem.lock()->getOfferFlowerTick() > 0;
|
||||
return golem.lock() != nullptr && golem.lock()->getOfferFlowerTick() > 0;
|
||||
}
|
||||
|
||||
void TakeFlowerGoal::start()
|
||||
{
|
||||
pickupTick = villager->getRandom()->nextInt((int) (OfferFlowerGoal::OFFER_TICKS * 0.8));
|
||||
pickupTick = villager->getRandom()->nextInt(static_cast<int>(OfferFlowerGoal::OFFER_TICKS * 0.8));
|
||||
takeFlower = false;
|
||||
golem.lock()->getNavigation()->stop();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user