From 8c03e4a73b46f8ad25824cb05a7efbaaf89e2d40 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 21 May 2022 20:25:15 +0200 Subject: [PATCH] Fix code style in IsPossibleToHit --- Source/monster.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/monster.cpp b/Source/monster.cpp index 701076aab..b0074ab2e 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -4999,13 +4999,11 @@ bool Monster::IsResistant(missile_id mName) const bool Monster::IsPossibleToHit() const { - if (_mhitpoints >> 6 <= 0 + return !(_mhitpoints >> 6 <= 0 || mtalkmsg != TEXT_NONE - || MType->mtype == MT_ILLWEAV && _mgoal == MGOAL_RETREAT + || (MType->mtype == MT_ILLWEAV && _mgoal == MGOAL_RETREAT) || _mmode == MonsterMode::Charge - || MType->mtype >= MT_COUNSLR && MType->mtype <= MT_ADVOCATE && _mgoal != MGOAL_NORMAL) - return false; - return true; + || (MType->mtype >= MT_COUNSLR && MType->mtype <= MT_ADVOCATE && _mgoal != MGOAL_NORMAL)); } bool Monster::TryLiftGargoyle()