Remove more instances where directing a cleave at empty space is optimal.

c876910 made some progress towards this, but left situations like

o@o
oo.

where the player must attack the empty space in order to be guaranteed to hit
all the monsters.

Now attacking any direction will hit all the monsters in this situation. This
is implemented by making the cleave targetter try to go more than 3-4 squares
around in each direction if the attacker is next to at least one wall.

Walls still stop cleaving as normal, so in the situation

O@o

the player has to choose whether to hit the ogre or the five orcs, as before.

1 files changed, 11 insertions, 1 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 53a911d78a..c677cfd9ba 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -633,7 +633,17 @@ void get_cleave_targets(const actor* attacker, const coord_def& def, int dir,
 
     const coord_def atk = attacker->pos();
     coord_def atk_vector = def - atk;
-    const int num = behind ? 4 : 3;
+    int num = behind ? 4 : 3;
+    // Let the cleave try to go farther around if we are sure that this
+    // won't overlap with going in the other direction.
+    for (adjacent_iterator ai(atk); ai; ++ai)
+    {
+        if (cell_is_solid(*ai))
+        {
+            num = 7;
+            break;
+        }
+    }
 
     for (int i = 0; i < num; ++i)
     {