diff options
author | megamage <none@none> | 2008-11-09 14:54:13 -0600 |
---|---|---|
committer | megamage <none@none> | 2008-11-09 14:54:13 -0600 |
commit | ee02a2fc84c564d82a062bd975281a4e4f0fefa0 (patch) | |
tree | 5bb99bbf8fae0f83fad278e766e1df2e80197be1 /src/game/Object.cpp | |
parent | 2c83fc42fc0bd963940047b1088f91c8b7474799 (diff) |
[svn] Send AttackStart package when update visibility.
Update DoMeleeAttackIfReady to support dual wield.
Show player modelid2 instead id3 of triggers. This should fix the bug that gameobject::castspell summon a human model.
Remove the correct flag to make creature attackable. This should fix the bug that Illidan and Magtheridon are unattackable.
Add NullCreatureAI for trinityscript.
Fix channeler's soul transfer.
Some update of black temple scripts.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
-rw-r--r-- | src/game/Object.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 568e9a90a31..0ceb71367ca 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -601,9 +601,19 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask if(cinfo->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER) { if(target->isGameMaster()) - *data << cinfo->Modelid1; + { + if(cinfo->Modelid2) + *data << cinfo->Modelid1; + else + *data << 17519; // world invisible trigger's model + } else - *data << cinfo->Modelid3; + { + if(cinfo->Modelid2) + *data << cinfo->Modelid2; + else + *data << 11686; // world invisible trigger's model + } } else *data << m_uint32Values[ index ]; |