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:
@@ -33,7 +33,7 @@ ThrownEgg::ThrownEgg(Level *level, double x, double y, double z) : Throwable(lev
|
||||
|
||||
void ThrownEgg::onHit(HitResult *res)
|
||||
{
|
||||
if (res->entity != NULL)
|
||||
if (res->entity != nullptr)
|
||||
{
|
||||
DamageSource *damageSource = DamageSource::thrown(shared_from_this(), owner);
|
||||
res->entity->hurt(damageSource, 0);
|
||||
@@ -47,7 +47,7 @@ void ThrownEgg::onHit(HitResult *res)
|
||||
if (random->nextInt(32) == 0) count = 4;
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
shared_ptr<Chicken> chicken = shared_ptr<Chicken>( new Chicken(level) );
|
||||
shared_ptr<Chicken> chicken = std::make_shared<Chicken>(level);
|
||||
chicken->setAge(-20 * 60 * 20);
|
||||
|
||||
chicken->moveTo(x, y, z, yRot, 0);
|
||||
|
||||
Reference in New Issue
Block a user