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:
@@ -46,12 +46,12 @@ void EnchantmentTableEntity::tick()
|
||||
oRot = rot;
|
||||
|
||||
shared_ptr<Player> player = level->getNearestPlayer(x + 0.5f, y + 0.5f, z + 0.5f, 3);
|
||||
if (player != NULL)
|
||||
if (player != nullptr)
|
||||
{
|
||||
double xd = player->x - (x + 0.5f);
|
||||
double zd = player->z - (z + 0.5f);
|
||||
|
||||
tRot = (float) atan2(zd, xd);
|
||||
tRot = static_cast<float>(atan2(zd, xd));
|
||||
|
||||
open += 0.1f;
|
||||
|
||||
@@ -124,7 +124,7 @@ void EnchantmentTableEntity::setCustomName(const wstring &name)
|
||||
|
||||
shared_ptr<TileEntity> EnchantmentTableEntity::clone()
|
||||
{
|
||||
shared_ptr<EnchantmentTableEntity> result = shared_ptr<EnchantmentTableEntity>( new EnchantmentTableEntity() );
|
||||
shared_ptr<EnchantmentTableEntity> result = std::make_shared<EnchantmentTableEntity>();
|
||||
TileEntity::clone(result);
|
||||
|
||||
result->time = time;
|
||||
|
||||
Reference in New Issue
Block a user