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:
@@ -62,14 +62,14 @@ void ThornsEnchantment::doThornsAfterAttack(shared_ptr<Entity> source, shared_pt
|
||||
source->hurt(DamageSource::thorns(target), getDamage(level, random));
|
||||
source->playSound(eSoundType_DAMAGE_THORNS, .5f, 1.0f);
|
||||
|
||||
if (item != NULL)
|
||||
if (item != nullptr)
|
||||
{
|
||||
item->hurtAndBreak(3, target);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (item != NULL)
|
||||
if (item != nullptr)
|
||||
{
|
||||
item->hurtAndBreak(1, target);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user