--- a/client/BattleInterface/CBattleInterface.cpp	2012-05-14 15:04:29.983787984 +0300
+++ b/client/BattleInterface/CBattleInterface.cpp	2012-05-14 15:47:48.000000000 +0300
@@ -613,6 +606,26 @@
 						CSDL_Ext::blit8bppAlphaTo24bpp(cellShade, NULL, to, &temp_rect);
 					}
 				}
+
+				const CStack * const shere = curInt->cb->battleGetStackByPos(b, false);
+
+				// display the movement shadow of the stack at b (i.e. stack under mouse)
+				if( shere && shere->alive() )
+				{
+					// activeStack == NULL means it is opponent's turn...
+					if( activeStack && shere != activeStack )
+					{
+						std::vector<BattleHex> v = curInt->cb->battleGetAvailableHexes(shere, true );
+						BOOST_FOREACH(BattleHex hex, v)
+						{
+							int x = 14 + ((hex/GameConstants::BFIELD_WIDTH)%2==0 ? 22 : 0) + 44*(hex%GameConstants::BFIELD_WIDTH) + pos.x;
+							int y = 86 + 42 * (hex/GameConstants::BFIELD_WIDTH) + pos.y;
+							SDL_Rect temp_rect = genRect(cellShade->h, cellShade->w, x, y);
+							CSDL_Ext::blit8bppAlphaTo24bpp(cellShade, NULL, to, &temp_rect);
+						}
+					}
+				}
+
 				//always highlight pointed hex
 				int x = 14 + ((b/GameConstants::BFIELD_WIDTH)%2==0 ? 22 : 0) + 44*(b%GameConstants::BFIELD_WIDTH) + pos.x;
 				int y = 86 + 42 * (b/GameConstants::BFIELD_WIDTH) + pos.y;

--- /usr/local/src/vcmi/trunk/client/BattleInterface/CBattleInterface.h	2012-05-28 11:16:13.141719235 +0300
+++ client/BattleInterface/CBattleInterface.h	2012-05-28 10:51:30.000000000 +0300
@@ -217,7 +217,7 @@
 
 	std::vector<CClickableHex> bfield; //11 lines, 17 hexes on each
 	//std::vector< CBattleObstacle * > obstacles; //vector of obstacles on the battlefield
-	SDL_Surface * cellBorder, * cellShade;
+	SDL_Surface * cellBorder, * cellShade, * cellEnemyShade;
 	CondSh<BattleAction *> *givenCommand; //data != NULL if we have i.e. moved current unit
 	bool myTurn; //if true, interface is active (commands can be ordered)
 	CBattleResultWindow * resWindow; //window of end of battle
--- /usr/local/src/vcmi/trunk/client/BattleInterface/CBattleInterface.cpp	2012-05-28 11:16:13.141719235 +0300
+++ client/BattleInterface/CBattleInterface.cpp	2012-05-28 11:12:28.000000000 +0300
@@ -267,6 +267,8 @@
 	CSDL_Ext::alphaTransform(cellBorder);
 	cellShade = BitmapHandler::loadBitmap("CCELLSHD.BMP");
 	CSDL_Ext::alphaTransform(cellShade);
+	cellEnemyShade = BitmapHandler::loadBitmap("CCELLSH2.BMP");
+	CSDL_Ext::alphaTransform(cellEnemyShade);
 	for(int h = 0; h < bfield.size(); ++h)
 	{
 		bfield[h].myNumber = h;
@@ -419,6 +421,7 @@
 
 	SDL_FreeSurface(cellBorder);
 	SDL_FreeSurface(cellShade);
+	SDL_FreeSurface(cellEnemyShade);
 
 	for(std::map< int, CCreatureAnimation * >::iterator g=creAnims.begin(); g!=creAnims.end(); ++g)
 		delete g->second;
@@ -646,8 +649,8 @@
 						{
 							int x = 14 + ((hex / GameConstants::BFIELD_WIDTH ) % 2 == 0 ? 22 : 0) + 44 * (hex % GameConstants::BFIELD_WIDTH) + pos.x;
 							int y = 86 + 42 * (hex / GameConstants::BFIELD_WIDTH) + pos.y;
-							SDL_Rect temp_rect = genRect (cellShade->h, cellShade->w, x, y);
-							CSDL_Ext::blit8bppAlphaTo24bpp (cellShade, NULL, to, &temp_rect);
+							SDL_Rect temp_rect = genRect (cellEnemyShade->h, cellEnemyShade->w, x, y);
+							CSDL_Ext::blit8bppAlphaTo24bpp (cellEnemyShade, NULL, to, &temp_rect);
 						}
 					}
 				}

--- /usr/local/src/vcmi/trunk/client/BattleInterface/CBattleInterface.cpp	2012-05-28 11:59:13.745978228 +0300
+++ client/BattleInterface/CBattleInterface.cpp	2012-05-28 11:54:05.000000000 +0300
@@ -635,10 +635,10 @@
 						CSDL_Ext::blit8bppAlphaTo24bpp(cellShade, NULL, to, &temp_rect);
 					}
 				}
-				//patch by ench0
 
+				//patch by ench0: show enemy stack movement shadow
 				// activeStack == NULL means it is opponent's turn...
-				if(activeStack)
+				if(activeStack && settings["battle"]["stackRange"].Bool())
 				{
 					// display the movement shadow of the stack at b (i.e. stack under mouse)
 					const CStack * const shere = curInt->cb->battleGetStackByPos(b, false);
@@ -654,6 +654,7 @@
 						}
 					}
 				}
+
 				//always highlight pointed hex
 				int x = 14 + ((b/GameConstants::BFIELD_WIDTH)%2==0 ? 22 : 0) + 44*(b%GameConstants::BFIELD_WIDTH) + pos.x;
 				int y = 86 + 42 * (b/GameConstants::BFIELD_WIDTH) + pos.y;