diff options
| author | QAston <none@none> | 2009-07-30 11:47:47 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-07-30 11:47:47 +0200 |
| commit | bc4e279cbd5d0decb5817c686eef7e582650e6f4 (patch) | |
| tree | 92fc322995b800ca2024abec1a9d067aa55c6db4 /src/game/Object.cpp | |
| parent | 9bd41d0255ba4b1a0bc217786e1bb4f3234a34ed (diff) | |
Backed out changeset 7fab27a57ecc - mangos [8218]
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
| -rw-r--r-- | src/game/Object.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 1ac4c8fa2f0..d565818910e 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -465,7 +465,6 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask return; bool IsActivateToQuest = false; - bool IsPerCasterAuraState = false; if (updatetype == UPDATETYPE_CREATE_OBJECT || updatetype == UPDATETYPE_CREATE_OBJECT2) { if (isType(TYPEMASK_GAMEOBJECT) && !((GameObject*)this)->IsTransport()) @@ -478,14 +477,6 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask if (((GameObject*)this)->GetGoArtKit()) updateMask->SetBit(GAMEOBJECT_BYTES_1); } - else if (isType(TYPEMASK_UNIT)) - { - if( ((Unit*)this)->HasAuraState(AURA_STATE_CONFLAGRATE)) - { - IsPerCasterAuraState = true; - updateMask->SetBit(UNIT_FIELD_AURASTATE); - } - } } else // case UPDATETYPE_VALUES { @@ -498,14 +489,6 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask updateMask->SetBit(GAMEOBJECT_DYNAMIC); updateMask->SetBit(GAMEOBJECT_BYTES_1); } - else if (isType(TYPEMASK_UNIT)) - { - if( ((Unit*)this)->HasAuraState(AURA_STATE_CONFLAGRATE)) - { - IsPerCasterAuraState = true; - updateMask->SetBit(UNIT_FIELD_AURASTATE); - } - } } WPAssert(updateMask && updateMask->GetCount() == m_valuesCount); @@ -530,19 +513,6 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *data << uint32(appendValue); } - else if (index == UNIT_FIELD_AURASTATE) - { - if(IsPerCasterAuraState) - { - // IsPerCasterAuraState set if related pet caster aura state set already - if (((Unit*)this)->HasAuraState(AURA_STATE_CONFLAGRATE, NULL, target)) - *data << m_uint32Values[ index ]; - else - *data << (m_uint32Values[ index ] & ~(1 << (AURA_STATE_CONFLAGRATE-1))); - } - else - *data << m_uint32Values[ index ]; - } // FIXME: Some values at server stored in float format but must be sent to client in uint32 format else if(index >= UNIT_FIELD_BASEATTACKTIME && index <= UNIT_FIELD_RANGEDATTACKTIME) { |