aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.h
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-11 16:14:45 -0500
committermegamage <none@none>2009-08-11 16:14:45 -0500
commit9403ff03e792154b5709a05d8dfdd7da123ce9b5 (patch)
treef6072a69420fcb17da553ef3bc5821daee895b3e /src/game/Object.h
parent4267816fca55b137bf4c7e4e530816dc5c4e7d43 (diff)
*Only use m_isWorldObject to check if an object is in grid or world.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Object.h')
-rw-r--r--src/game/Object.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Object.h b/src/game/Object.h
index 15bc7fcd003..28825d2154f 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -557,7 +557,6 @@ class TRINITY_DLL_SPEC WorldObject : public Object
template<class NOTIFIER> void VisitNearbyObject(const float &radius, NOTIFIER &notifier) const { GetMap()->VisitAll(GetPositionX(), GetPositionY(), radius, notifier); }
template<class NOTIFIER> void VisitNearbyGridObject(const float &radius, NOTIFIER &notifier) const { GetMap()->VisitGrid(GetPositionX(), GetPositionY(), radius, notifier); }
template<class NOTIFIER> void VisitNearbyWorldObject(const float &radius, NOTIFIER &notifier) const { GetMap()->VisitWorld(GetPositionX(), GetPositionY(), radius, notifier); }
- bool IsTempWorldObject;
#ifdef MAP_BASED_RAND_GEN
int32 irand(int32 min, int32 max) const { return int32 (GetMap()->mtRand.randInt(max - min)) + min; }
@@ -567,6 +566,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object
double rand_chance() const { return GetMap()->mtRand.randExc(100.0);}
#endif
+ bool m_isWorldObject;
protected:
explicit WorldObject();
std::string m_name;