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:
@@ -2,7 +2,7 @@
|
||||
#include "net.minecraft.world.level.tile.h"
|
||||
#include "HatchetItem.h"
|
||||
|
||||
TileArray *HatchetItem::diggables = NULL;
|
||||
TileArray *HatchetItem::diggables = nullptr;
|
||||
|
||||
void HatchetItem::staticCtor()
|
||||
{
|
||||
@@ -25,7 +25,7 @@ HatchetItem::HatchetItem(int id, const Tier *tier) : DiggerItem (id, 3, tier, di
|
||||
// 4J - brought forward from 1.2.3
|
||||
float HatchetItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile)
|
||||
{
|
||||
if (tile != NULL && (tile->material == Material::wood || tile->material == Material::plant || tile->material == Material::replaceable_plant))
|
||||
if (tile != nullptr && (tile->material == Material::wood || tile->material == Material::plant || tile->material == Material::replaceable_plant))
|
||||
{
|
||||
return speed;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user