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