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,7 +46,7 @@ shared_ptr<Entity> Monster::findAttackTarget()
|
||||
#endif
|
||||
|
||||
shared_ptr<Player> player = level->getNearestAttackablePlayer(shared_from_this(), 16);
|
||||
if (player != NULL && canSee(player) ) return player;
|
||||
if (player != nullptr && canSee(player) ) return player;
|
||||
return shared_ptr<Player>();
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ bool Monster::hurt(DamageSource *source, float dmg)
|
||||
*/
|
||||
bool Monster::doHurtTarget(shared_ptr<Entity> target)
|
||||
{
|
||||
float dmg = (float) getAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->getValue();
|
||||
float dmg = static_cast<float>(getAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->getValue());
|
||||
int knockback = 0;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user