From 8d8da21f95515a75ae785c39cda4a38c08f81a97 Mon Sep 17 00:00:00 2001 From: fgenesis Date: Sat, 21 Mar 2009 01:23:52 +0100 Subject: [PATCH] [7564] fixed WorldObject::HasInArc(): must return true if testing self (cherry picked from commit b3c138ca9d59aff522f8a82cd2e1554fa0fbfc8d) Signed-off-by: VladimirMangos --- src/game/Object.cpp | 4 ++++ src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/game/Object.cpp b/src/game/Object.cpp index c09d94cd6..d01ebfa47 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1159,6 +1159,10 @@ float WorldObject::GetAngle( const float x, const float y ) const bool WorldObject::HasInArc(const float arcangle, const WorldObject* obj) const { + // always have self in arc + if(obj == this) + return true; + float arc = arcangle; // move arc to range 0.. 2*pi diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a003fed5a..f1a629770 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7563" + #define REVISION_NR "7564" #endif // __REVISION_NR_H__