Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Add an errorlog in HasInArc function to find a bug.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-28 15:49:23 -05:00
parent 05011544df
commit 4a7a63e438
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/Object.cpp
View File

@@ -1387,8 +1387,6 @@ float WorldObject::GetAngle( const float x, const float y ) const
float dx = x - GetPositionX();
float dy = y - GetPositionY();
if(!dx && !dy)
return 0;
float ang = atan2(dy, dx);
ang = (ang >= 0) ? ang : 2 * M_PI + ang;
return ang;
@@ -1430,6 +1428,15 @@ bool WorldObject::HasInArc(const float arcangle, const WorldObject* obj) const
float angle = GetAngle( obj );
angle -= m_orientation;
if(angle > 100 || angle < -100)
{
sLog.outCrash("Invalid Angle %f: this %u %u %f %f %f %f, that %u %u %f %f %f %f", angle,
GetEntry(), GetGUIDLow(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(),
obj->GetEntry(), obj->GetGUIDLow(), obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation());
assert(false);
return false;
}
// move angle to range -pi ... +pi
while( angle > M_PI)
angle -= 2.0f * M_PI;

4
src/game/Unit.cpp
View File

@@ -456,7 +456,7 @@ void Unit::GetRandomContactPoint( const Unit* obj, float &x, float &y, float &z,
uint32 attacker_number = getAttackers().size();
if(attacker_number > 0) --attacker_number;
GetNearPoint(obj,x,y,z,obj->GetCombatReach(), distance2dMin+(distance2dMax-distance2dMin)*rand_norm()
, GetAngle(obj) + (attacker_number ? (M_PI/2 - M_PI * rand_norm()) * (float)attacker_number / combat_reach / 3 : 0));
, GetAngle(obj) + (attacker_number ? (M_PI/2 - M_PI * rand_norm()) * (float)attacker_number / combat_reach * 0.3 : 0));
}
void Unit::RemoveMovementImpairingAuras()
@@ -12416,7 +12416,7 @@ void Unit::StopMoving()
//float z = MapManager::Instance().GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true);
//if (fabs(GetPositionZ() - z) < 2.0f)
// Relocate(GetPositionX(), GetPositionY(), z);
Relocate(GetPositionX(), GetPositionY(),GetPositionZ());
//Relocate(GetPositionX(), GetPositionY(),GetPositionZ());
SendMonsterStop();