diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/DestinationHolderImp.h | 11 | ||||
| -rw-r--r-- | src/game/TargetedMovementGenerator.cpp | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/game/DestinationHolderImp.h b/src/game/DestinationHolderImp.h index 3d3adc94340..c84ce19a96d 100644 --- a/src/game/DestinationHolderImp.h +++ b/src/game/DestinationHolderImp.h @@ -119,10 +119,10 @@ DestinationHolder<TRAVELLER>::UpdateTraveller(TRAVELLER &traveller, uint32 diff, if(!traveller.GetTraveller().hasUnitState(UNIT_STAT_MOVING | UNIT_STAT_IN_FLIGHT)) return true; - if(traveller.GetTraveller().hasUnitState(UNIT_STAT_IN_FLIGHT) || traveller.GetTraveller().IsFlying()) + if(traveller.GetTraveller().hasUnitState(UNIT_STAT_IN_FLIGHT)) GetLocationNow(traveller.GetTraveller().GetBaseMap() ,x, y, z, true); // Should reposition Object with right Coord, so I can bypass some Grid Relocation else - GetLocationNow(traveller.GetTraveller().GetMap(), x, y, z, false); + GetLocationNow(traveller.GetTraveller().GetBaseMap(), x, y, z, false); if( x == -431602080 ) return false; @@ -175,16 +175,13 @@ DestinationHolder<TRAVELLER>::GetLocationNow(const Map * map, float &x, float &y z = z2; else { - /*//That part is good for mob Walking on the floor. But the floor is not always what we thought. + //That part is good for mob Walking on the floor. But the floor is not always what we thought. z = map->GetHeight(x,y,i_fromZ,false); // Disable cave check const float groundDist = sqrt(distanceX*distanceX + distanceY*distanceY); const float zDist = fabs(i_fromZ - z) + 0.000001f; const float slope = groundDist / zDist; if(slope < 1.0f) // This prevents the ground returned by GetHeight to be used when in cave - z = z2; // a climb or jump of more than 45 is denied*/ - float ground = map->GetHeight(x,y,MAX_HEIGHT,true); - float floor = map->GetHeight(x,y,z2,true); - z = (fabs(ground - z2) <= fabs(floor - z2)) ? ground:floor; + z = z2; // a climb or jump of more than 45 is denied } } } diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp index da7b5cc41fe..c1c601921b3 100644 --- a/src/game/TargetedMovementGenerator.cpp +++ b/src/game/TargetedMovementGenerator.cpp @@ -205,9 +205,7 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff) return true; } - bool update_traveller = (owner.GetTypeId() == TYPEID_UNIT && !((Creature*)&owner)->isPet())? i_destinationHolder.UpdateTraveller(traveller, time_diff, true) : i_destinationHolder.UpdateTraveller(traveller, time_diff, false); - //if (i_destinationHolder.UpdateTraveller(traveller, time_diff)) - if(update_traveller) + if (i_destinationHolder.UpdateTraveller(traveller, time_diff)) { // put targeted movement generators on a higher priority //if (owner.GetObjectSize()) |