aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/GameObject
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-03-02 16:50:09 +0100
committerShauren <shauren.trinity@gmail.com>2011-03-02 16:50:09 +0100
commit6c020c72cc46388b04350adcfa4ffab7bc9b2c2c (patch)
treec86b1e7d43ec853f8969973e4e6d88ae3d5f8127 /src/server/game/Entities/GameObject
parent2b9346e5a0ceacd6d73a7ac39c24840e450181b2 (diff)
Core/SAI: Implemented Gameobject action allowing to send SMSG_GAMEOBJECT_CUSTOM_ANIM with parameter set in param1
Diffstat (limited to 'src/server/game/Entities/GameObject')
-rwxr-xr-xsrc/server/game/Entities/GameObject/GameObject.cpp8
-rwxr-xr-xsrc/server/game/Entities/GameObject/GameObject.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 6bbb1784ee1..3c5521f6b87 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -306,7 +306,7 @@ void GameObject::Update(uint32 diff)
udata.BuildPacket(&packet);
caster->ToPlayer()->GetSession()->SendPacket(&packet);
- SendCustomAnim();
+ SendCustomAnim(GetGoAnimProgress());
}
m_lootState = GO_READY; // can be successfully open with some chance
@@ -1212,7 +1212,7 @@ void GameObject::Use(Unit* user)
// this appear to be ok, however others exist in addition to this that should have custom (ex: 190510, 188692, 187389)
if (time_to_restore && info->goober.customAnim)
- SendCustomAnim();
+ SendCustomAnim(GetGoAnimProgress());
else
SetGoState(GO_STATE_ACTIVE);
@@ -1637,11 +1637,11 @@ void GameObject::CastSpell(Unit* target, uint32 spellId)
//trigger->RemoveCorpse();
}
-void GameObject::SendCustomAnim()
+void GameObject::SendCustomAnim(uint32 anim)
{
WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM,8+4);
data << GetGUID();
- data << uint32(GetGoAnimProgress());
+ data << uint32(anim);
SendMessageToSet(&data, true);
}
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index c913c317772..6254666fdf6 100755
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -748,7 +748,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>
GameObject* LookupFishingHoleAround(float range);
void CastSpell(Unit *target, uint32 spell);
- void SendCustomAnim();
+ void SendCustomAnim(uint32 anim);
bool IsInRange(float x, float y, float z, float radius) const;
void TakenDamage(uint32 damage, Unit* who = NULL);
void Rebuild();