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:
@@ -91,7 +91,7 @@ int QuartzBlockTile::getSpawnResourcesAuxValue(int data)
|
||||
|
||||
shared_ptr<ItemInstance> QuartzBlockTile::getSilkTouchItemInstance(int data)
|
||||
{
|
||||
if (data == TYPE_LINES_X || data == TYPE_LINES_Z) return shared_ptr<ItemInstance>(new ItemInstance(id, 1, TYPE_LINES_Y));
|
||||
if (data == TYPE_LINES_X || data == TYPE_LINES_Z) return std::make_shared<ItemInstance>(id, 1, TYPE_LINES_Y);
|
||||
return Tile::getSilkTouchItemInstance(data);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user