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:
@@ -3,7 +3,7 @@
|
||||
#include "Tile.h"
|
||||
#include "FurnaceRecipes.h"
|
||||
|
||||
FurnaceRecipes *FurnaceRecipes::instance = NULL;
|
||||
FurnaceRecipes *FurnaceRecipes::instance = nullptr;
|
||||
|
||||
void FurnaceRecipes::staticCtor()
|
||||
{
|
||||
@@ -63,7 +63,7 @@ ItemInstance *FurnaceRecipes::getResult(int itemId)
|
||||
{
|
||||
return it->second;
|
||||
}
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
unordered_map<int, ItemInstance *> *FurnaceRecipes::getRecipies()
|
||||
|
||||
Reference in New Issue
Block a user