diff options
author | Shauren <shauren.trinity@gmail.com> | 2011-02-15 17:09:46 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2011-02-15 17:09:46 +0100 |
commit | a24deaf9801216657beb80f04d7a7d28b6d0cb4f (patch) | |
tree | 64fd804fc2f110176c7e7ea14c3aa145a6626c6c | |
parent | ad11baffe66ba5d3124bde7ebf8fdbee5462f3ac (diff) |
Core/Objects: Fixed HasInLine and IsInBetween checks on certain compilers
-rwxr-xr-x | src/server/game/Entities/Object/Object.cpp | 4 | ||||
-rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 0cd1f8e6143..51aaa55aafe 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1145,7 +1145,7 @@ bool Position::HasInLine(const Unit * const target, float distance, float width) return false; width += target->GetObjectSize(); float angle = GetRelativeAngle(target); - return abs(sin(angle)) * GetExactDist2d(target->GetPositionX(), target->GetPositionY()) < width; + return fabs(sin(angle)) * GetExactDist2d(target->GetPositionX(), target->GetPositionY()) < width; } std::string Position::ToString() const @@ -1532,7 +1532,7 @@ bool WorldObject::IsInBetween(const WorldObject *obj1, const WorldObject *obj2, size = GetObjectSize() / 2; float angle = obj1->GetAngle(this) - obj1->GetAngle(obj2); - return abs(sin(angle)) * GetExactDist2d(obj1->GetPositionX(), obj1->GetPositionY()) < size; + return fabs(sin(angle)) * GetExactDist2d(obj1->GetPositionX(), obj1->GetPositionY()) < size; } bool WorldObject::isInFront(WorldObject const* target, float distance, float arc) const diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c0d5465de5a..ea221d844ac 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2316,7 +2316,7 @@ void Player::Regenerate(Powers power) return; addvalue += m_powerFraction[power]; - uint32 integerValue = uint32(abs(addvalue)); + uint32 integerValue = uint32(fabs(addvalue)); if (addvalue < 0.0f) { |