Core: Fix build due to merge resolution errors

This commit is contained in:
DDuarte committed 2014-01-11 23:29:27 +00:00
1 parent ced89d7c68
commit b204d71cb4
9 files changed
+17 -40

No files matched your search

@@ -60,7 +60,7 @@ namespace Movement
{
MoveSpline& move_spline = *unit->movespline;
bool transport = unit->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit->GetTransGUID();
bool transport = unit->GetTransGUID();
Location real_position;
// there is a big chance that current position is unknown if current state is not finalized, need compute it
// this also allows calculate spline position and update map position in much greater intervals
@@ -138,7 +138,7 @@ namespace Movement
if (move_spline.Finalized())
return;
bool transport = unit->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit->GetTransGUID();
bool transport = unit->GetTransGUID();
Location loc;
if (move_spline.onTransport == transport)
loc = move_spline.ComputePosition();