From e585187b248f48b3c6e9247b49fa07c6565d65e5 Mon Sep 17 00:00:00 2001 From: maximius Date: Sat, 17 Oct 2009 15:51:44 -0700 Subject: *Backed out changeset 3be01fb200a5 --HG-- branch : trunk --- src/game/HomeMovementGenerator.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/game/HomeMovementGenerator.cpp') diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp index 435d1be1ab2..e2fc9b1e0ec 100644 --- a/src/game/HomeMovementGenerator.cpp +++ b/src/game/HomeMovementGenerator.cpp @@ -17,12 +17,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include "HomeMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" #include "Traveller.h" #include "DestinationHolderImp.h" #include "WorldPacket.h" + void HomeMovementGenerator::Initialize(Creature & owner) { @@ -32,32 +34,41 @@ HomeMovementGenerator::Initialize(Creature & owner) owner.addUnitState(UNIT_STAT_EVADE); _setTargetLocation(owner); } + void HomeMovementGenerator::Reset(Creature &) { } + void HomeMovementGenerator::_setTargetLocation(Creature & owner) { if( !&owner ) return; + if( owner.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED) ) return; + float x, y, z; owner.GetHomePosition(x, y, z, ori); + CreatureTraveller traveller(owner); + uint32 travel_time = i_destinationHolder.SetDestination(traveller, x, y, z); modifyTravelTime(travel_time); owner.clearUnitState(UNIT_STAT_ALL_STATE); } + bool HomeMovementGenerator::Update(Creature &owner, const uint32& time_diff) { CreatureTraveller traveller( owner); i_destinationHolder.UpdateTraveller(traveller, time_diff); + if (time_diff > i_travel_timer) { owner.AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + // restore orientation of not moving creature at returning to home if(owner.GetDefaultMovementType()==IDLE_MOTION_TYPE) { @@ -67,11 +78,14 @@ HomeMovementGenerator::Update(Creature &owner, const uint32& time_diff owner.BuildHeartBeatMsg(&packet); owner.SendMessageToSet(&packet, false); } + owner.clearUnitState(UNIT_STAT_EVADE); owner.AI()->JustReachedHome(); return false; } + i_travel_timer -= time_diff; + return true; } -- cgit v1.2.3