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:
@@ -23,14 +23,14 @@ int PressurePlateTile::getSignalForData(int data)
|
||||
|
||||
int PressurePlateTile::getSignalStrength(Level *level, int x, int y, int z)
|
||||
{
|
||||
vector< shared_ptr<Entity> > *entities = NULL;
|
||||
vector< shared_ptr<Entity> > *entities = nullptr;
|
||||
|
||||
if (sensitivity == everything) entities = level->getEntities(nullptr, getSensitiveAABB(x, y, z));
|
||||
else if (sensitivity == mobs) entities = level->getEntitiesOfClass(typeid(LivingEntity), getSensitiveAABB(x, y, z));
|
||||
else if (sensitivity == players) entities = level->getEntitiesOfClass(typeid(Player), getSensitiveAABB(x, y, z));
|
||||
else __debugbreak(); // 4J-JEV: We're going to delete something at a random location.
|
||||
|
||||
if (entities != NULL && !entities->empty())
|
||||
if (entities != nullptr && !entities->empty())
|
||||
{
|
||||
for (auto& e : *entities)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user