From 33aa51b5b561d40f46ffd5b9ead18cdfbbc553fd Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 28 Dec 2010 02:24:54 +0000
Subject: [PATCH] - if we cannot put the unit in a cell because it is already
 occupied do not cancel the existing command

---
 source/glest_game/world/map.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/glest_game/world/map.cpp b/source/glest_game/world/map.cpp
index 86caaebf..30c6fbdf 100644
--- a/source/glest_game/world/map.cpp
+++ b/source/glest_game/world/map.cpp
@@ -837,8 +837,8 @@ void Map::putUnitCells(Unit *unit, const Vec2i &pos) {
                     if(unit->getCurrSkill() != NULL &&
                        unit->getCurrSkill()->getClass() == scMove) {
                         canPutInCell = false;
-                        unit->setCurrSkill(scStop);
-                        unit->finishCommand();
+                        //unit->setCurrSkill(scStop);
+                        //unit->finishCommand();
 
                         //SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] POSSIBLE ERROR [getCell(currPos)->getUnit(unit->getCurrField()) != NULL] currPos [%s] unit [%s] cell unit [%s]\n",
                         //      __FILE__,__FUNCTION__,__LINE__,