From 448a3a6604d2e99223a9b7e604564ecc224bb845 Mon Sep 17 00:00:00 2001
From: DjWarmonger <warmonger@vp.pl>
Date: Sun, 23 Oct 2011 06:15:41 +0000
Subject: [PATCH] Fix for attacks of casting creatures. Version set to release
 build 0.86c.

---
 ChangeLog                   | 19 +++++++++++++++++++
 client/CBattleInterface.cpp | 10 ++++++++--
 global.h                    |  2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f82ae8d83..ce3c69330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+0.86 -> 0.87
+
+GENERAL:
+* Pathfinder can find way using ships and subterranean gates
+BATTLES
+* All attacked hexes will be highlighted
+* New combat abilities supported:
+- Spell Resistance aura
+- Random spellcaster (Genies)
+- Mana channeling
+- Daemon summoning
+- Spellcaster (Archangel Ogre Mage, Elementals, Faerie Dragon)
+- Fear
+- Fearless
+- No wall penalty
+- Enchanter
+- Bind
+- Dispell helpful spells
+
 0.85 -> 0.86 (Sep 01 2011)
 GENERAL:
 * Reinstated music support
diff --git a/client/CBattleInterface.cpp b/client/CBattleInterface.cpp
index 244ec5899..815c17722 100644
--- a/client/CBattleInterface.cpp
+++ b/client/CBattleInterface.cpp
@@ -2866,6 +2866,7 @@ void CBattleInterface::hexLclicked(int whichOne)
 		else //we don't aim for spell target area
 		{
 			bool walkableTile = false;
+			bool spellCast = false;
 			if (dest)
 			{
 				bool ourStack = actSt->owner == dest->owner;
@@ -2881,6 +2882,7 @@ void CBattleInterface::hexLclicked(int whichOne)
 							if ((spell->positiveness > -1 && ourStack) || (spell->positiveness < 1 && !ourStack))
 							{
 								giveCommand(BattleAction::MONSTER_SPELL, whichOne, actSt->ID, creatureSpellToCast);
+								spellCast = true;
 							}
 						}
 					}
@@ -2892,11 +2894,15 @@ void CBattleInterface::hexLclicked(int whichOne)
 							if (spellID > -1) //can cast any spell on target stack
 							{
 								giveCommand(BattleAction::MONSTER_SPELL, whichOne, actSt->ID, spellID); //use randomized spell
+								spellCast = true;
 							}
 						}
 					}
-					creatureSpellToCast = -1;
-					return; //no further action after cast
+					if (spellCast)
+					{
+						creatureSpellToCast = -1;
+						return; //no further action after cast
+					}
 				}
 
 				if (dest->alive())
diff --git a/global.h b/global.h
index 70cc49cee..eca451bfc 100644
--- a/global.h
+++ b/global.h
@@ -38,7 +38,7 @@ typedef si32 TBonusSubtype;
 #define THC
 #endif
 
-#define NAME_VER ("VCMI 0.86b")
+#define NAME_VER ("VCMI 0.86c")
 extern std::string NAME; //full name
 extern std::string NAME_AFFIX; //client / server
 #define CONSOLE_LOGGING_LEVEL 5