Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
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 != nullptr && canSee(player) ) return player;
|
||||
if (player != NULL && 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 = static_cast<float>(getAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->getValue());
|
||||
float dmg = (float) getAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->getValue();
|
||||
int knockback = 0;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user