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:
@@ -16,9 +16,9 @@ BedTile::BedTile(int id) : DirectionalTile(id, Material::cloth, isSolidRender())
|
||||
{
|
||||
setShape();
|
||||
|
||||
iconEnd = NULL;
|
||||
iconSide = NULL;
|
||||
iconTop = NULL;
|
||||
iconEnd = nullptr;
|
||||
iconSide = nullptr;
|
||||
iconTop = nullptr;
|
||||
}
|
||||
|
||||
// 4J Added override
|
||||
@@ -120,7 +120,7 @@ bool BedTile::use(Level *level, int x, int y, int z, shared_ptr<Player> player,
|
||||
}
|
||||
}
|
||||
|
||||
if (sleepingPlayer == NULL)
|
||||
if (sleepingPlayer == nullptr)
|
||||
{
|
||||
setOccupied(level, x, y, z, false);
|
||||
}
|
||||
@@ -309,7 +309,7 @@ Pos *BedTile::findStandUpPosition(Level *level, int x, int y, int z, int skipCou
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void BedTile::spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonus)
|
||||
|
||||
Reference in New Issue
Block a user