josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset: f86476eb503d

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-07 14:41:14 -05:00
parent d7f7862d96
commit 6fe8d1269d
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/DestinationHolderImp.h
+4 -7
View File
@@ -119,10 +119,10 @@ DestinationHolder<TRAVELLER>::UpdateTraveller(TRAVELLER &traveller, uint32 diff,
if(!traveller.GetTraveller().hasUnitState(UNIT_STAT_MOVING | UNIT_STAT_IN_FLIGHT)) if(!traveller.GetTraveller().hasUnitState(UNIT_STAT_MOVING | UNIT_STAT_IN_FLIGHT))
return true; 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 GetLocationNow(traveller.GetTraveller().GetBaseMap() ,x, y, z, true); // Should reposition Object with right Coord, so I can bypass some Grid Relocation
else else
GetLocationNow(traveller.GetTraveller().GetMap(), x, y, z, false); GetLocationNow(traveller.GetTraveller().GetBaseMap(), x, y, z, false);
if( x == -431602080 ) if( x == -431602080 )
return false; return false;
@@ -175,16 +175,13 @@ DestinationHolder<TRAVELLER>::GetLocationNow(const Map * map, float &x, float &y
z = z2; z = z2;
else 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 z = map->GetHeight(x,y,i_fromZ,false); // Disable cave check
const float groundDist = sqrt(distanceX*distanceX + distanceY*distanceY); const float groundDist = sqrt(distanceX*distanceX + distanceY*distanceY);
const float zDist = fabs(i_fromZ - z) + 0.000001f; const float zDist = fabs(i_fromZ - z) + 0.000001f;
const float slope = groundDist / zDist; const float slope = groundDist / zDist;
if(slope < 1.0f) // This prevents the ground returned by GetHeight to be used when in cave 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*/ 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;
} }
} }
} }
src/game/TargetedMovementGenerator.cpp
+1 -3
View File
@@ -205,9 +205,7 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
return true; 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 (i_destinationHolder.UpdateTraveller(traveller, time_diff))
if(update_traveller)
{ {
// put targeted movement generators on a higher priority // put targeted movement generators on a higher priority
//if (owner.GetObjectSize()) //if (owner.GetObjectSize())