diff options
Diffstat (limited to 'src/game/DynamicObject.h')
| -rw-r--r-- | src/game/DynamicObject.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/game/DynamicObject.h b/src/game/DynamicObject.h index 1bcd29998f8..22009b92d14 100644 --- a/src/game/DynamicObject.h +++ b/src/game/DynamicObject.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * - * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ class DynamicObject : public WorldObject uint32 GetSpellId() const { return m_spellId; } uint32 GetEffIndex() const { return m_effIndex; } uint32 GetDuration() const { return m_aliveDuration; } - uint64 GetCasterGUID() const { return m_casterGuid; } + uint64 GetCasterGUID() const { return GetUInt64Value(DYNAMICOBJECT_CASTER); } Unit* GetCaster() const; float GetRadius() const { return m_radius; } bool IsAffecting(Unit *unit) const { return m_affected.find(unit) != m_affected.end(); } @@ -50,18 +50,14 @@ class DynamicObject : public WorldObject void Delay(int32 delaytime); bool isVisibleForInState(Player const* u, bool inVisibleList) const; - void Say(const char* text, uint32 language, uint64 TargetGuid) { MonsterSay(text,language,TargetGuid); } - void Yell(const char* text, uint32 language, uint64 TargetGuid) { MonsterYell(text,language,TargetGuid); } - void TextEmote(const char* text, uint64 TargetGuid) { MonsterTextEmote(text,TargetGuid); } - void Whisper(const char* text, uint64 receiver) { MonsterWhisper(text,receiver); } void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); } void Whisper(int32 textId,uint64 receiver) { MonsterWhisper(textId,receiver); } + void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId,language,TargetGuid); } GridReference<DynamicObject> &GetGridRef() { return m_gridRef; } protected: - uint64 m_casterGuid; uint32 m_spellId; uint32 m_effIndex; int32 m_aliveDuration; |