Simplify, optimise, and improve formatting

1 files changed, 6 insertions, 7 deletions

diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc
index 9f0941fcf5..631ad7629a 100644
--- a/crawl-ref/source/mon-info.cc
+++ b/crawl-ref/source/mon-info.cc
@@ -1815,20 +1815,19 @@ bool monster_info::has_spells() const
     const size_t num_books = books.size();
 
     // Random pan lords don't display their spells.
-    if (num_books == 0 || books[0] == MST_NO_SPELLS || this->type == MONS_PANDEMONIUM_LORD)
+    if (num_books == 0 || books[0] == MST_NO_SPELLS
+        || type == MONS_PANDEMONIUM_LORD)
+    {
         return false;
+    }
 
     // Ghosts have a special book but may not have any spells anyways.
     if (books[0] == MST_GHOST)
     {
-        bool has_spell = false;
         for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; ++i)
-        {
             if (this->spells[i] != SPELL_NO_SPELL)
-                has_spell = true;
-        }
-        if (!has_spell)
-            return false;
+                return true;
+        return false;
     }
 
     return true;