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:
@@ -32,7 +32,7 @@ ThrownEnderpearl::ThrownEnderpearl(Level *level, double x, double y, double z) :
|
||||
|
||||
void ThrownEnderpearl::onHit(HitResult *res)
|
||||
{
|
||||
if (res->entity != NULL)
|
||||
if (res->entity != nullptr)
|
||||
{
|
||||
DamageSource *damageSource = DamageSource::thrown(shared_from_this(), getOwner() );
|
||||
res->entity->hurt(damageSource, 0);
|
||||
@@ -49,7 +49,7 @@ void ThrownEnderpearl::onHit(HitResult *res)
|
||||
// If the owner has been removed, then ignore
|
||||
|
||||
// 4J-JEV: Cheap type check first.
|
||||
if ( (getOwner() != NULL) && getOwner()->instanceof(eTYPE_SERVERPLAYER) )
|
||||
if ( (getOwner() != nullptr) && getOwner()->instanceof(eTYPE_SERVERPLAYER) )
|
||||
{
|
||||
shared_ptr<ServerPlayer> serverPlayer = dynamic_pointer_cast<ServerPlayer>(getOwner() );
|
||||
if (!serverPlayer->removed)
|
||||
|
||||
Reference in New Issue
Block a user