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:
@@ -86,7 +86,7 @@ shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(shared_ptr<Player> player,
|
||||
|
||||
bool charcoalUsed = furnace->wasCharcoalUsed();
|
||||
|
||||
if (slot != NULL && slot->hasItem())
|
||||
if (slot != nullptr && slot->hasItem())
|
||||
{
|
||||
shared_ptr<ItemInstance> stack = slot->getItem();
|
||||
clicked = stack->copy();
|
||||
@@ -112,7 +112,7 @@ shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(shared_ptr<Player> player,
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
else if (FurnaceRecipes::getInstance()->getResult(stack->getItem()->id) != NULL)
|
||||
else if (FurnaceRecipes::getInstance()->getResult(stack->getItem()->id) != nullptr)
|
||||
{
|
||||
if (!moveItemStackTo(stack, INGREDIENT_SLOT, INGREDIENT_SLOT + 1, false))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user