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:
@@ -58,7 +58,7 @@ bool CraftingContainer::hasCustomName()
|
||||
|
||||
shared_ptr<ItemInstance> CraftingContainer::removeItemNoUpdate(int slot)
|
||||
{
|
||||
if ((*items)[slot] != NULL)
|
||||
if ((*items)[slot] != nullptr)
|
||||
{
|
||||
shared_ptr<ItemInstance> item = (*items)[slot];
|
||||
(*items)[slot] = nullptr;
|
||||
@@ -69,7 +69,7 @@ shared_ptr<ItemInstance> CraftingContainer::removeItemNoUpdate(int slot)
|
||||
|
||||
shared_ptr<ItemInstance> CraftingContainer::removeItem(unsigned int slot, int count)
|
||||
{
|
||||
if ((*items)[slot] != NULL)
|
||||
if ((*items)[slot] != nullptr)
|
||||
{
|
||||
if ((*items)[slot]->count <= count)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user