From 6b14c214469d2b7469c0c23f2002f91ee28e9a07 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 9 Jun 2011 21:50:54 +0000 Subject: [PATCH] - missed some things in last bugfix --- source/glest_game/world/unit_updater.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/source/glest_game/world/unit_updater.cpp b/source/glest_game/world/unit_updater.cpp index e54f5097..5989c880 100644 --- a/source/glest_game/world/unit_updater.cpp +++ b/source/glest_game/world/unit_updater.cpp @@ -483,7 +483,17 @@ void UnitUpdater::updateAttack(Unit *unit, int frameIndex) { else { //if unit arrives destPos order has ended switch (tsValue) { - + case tsMoving: + unit->setCurrSkill(act->getMoveSkillType()); + break; + case tsBlocked: + if(unit->getPath()->isBlocked()) { + unit->finishCommand(); + } + break; + default: + unit->finishCommand(); + } /* case tsMoving: unit->setCurrSkill(act->getMoveSkillType()); @@ -514,7 +524,7 @@ void UnitUpdater::updateAttack(Unit *unit, int frameIndex) { } break; -*/ + case tsBlocked: if(unit->getPath()->isBlocked()){ unit->finishCommand(); @@ -523,6 +533,7 @@ void UnitUpdater::updateAttack(Unit *unit, int frameIndex) { default: unit->finishCommand(); } +*/ } } if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());