diff options
Diffstat (limited to 'src')
5 files changed, 15 insertions, 66 deletions
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index 331561e1784..3cea78dfde9 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -413,11 +413,11 @@ SET(trinityscript_LIB_SRCS scripts/zone/nexus/oculus/boss_varos.cpp scripts/zone/nexus/oculus/boss_eregos.cpp scripts/zone/nexus/oculus/def_oculus.h - scripts/zone/azjol_nerub/azjol-nerub/instance_azjol-nerub.cpp + scripts/zone/azjol-nerub/azjol-nerub/instance_azjol_nerub.cpp scripts/zone/azjol-nerub/azjol-nerub/boss_krik_thir.cpp scripts/zone/azjol-nerub/azjol-nerub/boss_hadronox.cpp scripts/zone/azjol-nerub/azjol-nerub/boss_anub_arak.cpp - scripts/zone/azjol-nerub/azjol-nerub/def_azjol-nerub.h + scripts/zone/azjol-nerub/azjol-nerub/def_azjol_nerub.h scripts/zone/azjol-nerub/ahnkahet/instance_ahnkahet.cpp scripts/zone/azjol-nerub/ahnkahet/boss_taldaram.cpp scripts/zone/azjol-nerub/ahnkahet/boss_nadox.cpp @@ -425,12 +425,12 @@ SET(trinityscript_LIB_SRCS scripts/zone/azjol-nerub/ahnkahet/boss_volazj.cpp scripts/zone/azjol-nerub/ahnkahet/boss_aminitar.cpp scripts/zone/azjol-nerub/ahnkahet/def_ahnkahet.h - scripts/zone/draktharon_keep/instance_draktharon_keep.cpp + scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp scripts/zone/draktharon_keep/boss_trollgore.cpp scripts/zone/draktharon_keep/boss_novos.cpp scripts/zone/draktharon_keep/boss_dred.cpp scripts/zone/draktharon_keep/boss_tharon_ja.cpp - scripts/zone/draktharon_keep/def_draktharon_keep.h + scripts/zone/draktharon_keep/def_drak_tharon_keep.h scripts/zone/violet_hold/instance_violet_hold.cpp scripts/zone/violet_hold/boss_cyanigosa.cpp scripts/zone/violet_hold/boss_erekem.cpp @@ -471,7 +471,7 @@ SET(trinityscript_LIB_SRCS scripts/zone/obsidian_sanctum/boss_sartharion.cpp scripts/zone/obsidian_sanctum/def_obsidian_sanctum.h scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp - scripts/zone/vault_of_archavon/boss_vault_of_archavon.cpp + scripts/zone/vault_of_archavon/boss_archavon.cpp scripts/zone/vault_of_archavon/def_vault_of_archavon.h system.cpp ) diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj index d2629224f68..7f3699d76cc 100644 --- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj +++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj @@ -876,10 +876,6 @@ > </File> <File - RelativePath="..\scripts\zone\azjol-nerub\azjol-nerub\boss_hadronox.cpp" - > - </File> - <File RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_hadronox.cpp" > </File> @@ -892,10 +888,6 @@ > </File> <File - RelativePath="..\scripts\zone\azjol-nerub\azjol-nerub\def_azjol-nerub.h" - > - </File> - <File RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\def_azjol_nerub.h" > </File> @@ -1168,10 +1160,6 @@ > </File> <File - RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_keleseth.cpp" - > - </File> - <File RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald.cpp" > </File> diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/def_azjol-nerub.h b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/def_azjol-nerub.h deleted file mode 100644 index 56223b7b440..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/def_azjol-nerub.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef DEF_AZJOL_NERUB_H -#define DEF_AZJOL_NERUB_H - -#endif diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol-nerub.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol-nerub.cpp deleted file mode 100644 index 2267735df3a..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol-nerub.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "precompiled.h" -#include "def_azjol-nerub.h" - -struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance -{ - instance_azjol_nerub(Map *Map) : ScriptedInstance(Map) {Initialize();}; -}; - -InstanceData* GetInstanceData_instance_azjol_nerub(Map* map) -{ - return new instance_azjol_nerub(map); -} - -void AddSC_instance_azjol_nerub() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_azjol_nerub"; - newscript->GetInstanceData = GetInstanceData_instance_azjol_nerub; - newscript->RegisterSelf(); -} diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 8c16f39cfc6..7ac0ff8c8a6 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -749,20 +749,10 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask void Object::ClearUpdateMask(bool remove) { - if(!m_uint32Values_mirror || !m_uint32Values) - { - sLog.outCrash("Object::ClearUpdateMask: Object entry %u (type %u) does not have uint32Values", GetEntry(), GetTypeId()); - return; - } + uint32 *temp = m_uint32Values; - uint32 temp = m_uint32Values[0]; - temp = m_uint32Values_mirror[0]; + memcpy(m_uint32Values_mirror, m_uint32Values, m_valuesCount*sizeof(uint32)); - for( uint16 index = 0; index < m_valuesCount; index ++ ) - { - if(m_uint32Values_mirror[index]!= m_uint32Values[index]) - m_uint32Values_mirror[index] = m_uint32Values[index]; - } if(m_objectUpdated) { if(remove) @@ -806,27 +796,23 @@ bool Object::LoadValues(const char* data) void Object::_SetUpdateBits(UpdateMask *updateMask, Player* /*target*/) const { - if(!m_uint32Values_mirror || !m_uint32Values) - { - sLog.outCrash("Object::_SetUpdateBits: Object entry %u (type %u) does not have uint32Values", GetEntry(), GetTypeId()); - return; - } + uint32 *value = m_uint32Values; + uint32 *mirror = m_uint32Values_mirror; - uint32 temp = m_uint32Values[0]; - temp = m_uint32Values_mirror[0]; - - for(uint16 index = 0; index < m_valuesCount; ++index) + for(uint16 index = 0; index < m_valuesCount; ++index, ++value, ++mirror) { - if(m_uint32Values_mirror[index]!= m_uint32Values[index]) + if(*mirror != *value) updateMask->SetBit(index); } } void Object::_SetCreateBits(UpdateMask *updateMask, Player* /*target*/) const { - for( uint16 index = 0; index < m_valuesCount; index++ ) + uint32 *value = m_uint32Values; + + for(uint16 index = 0; index < m_valuesCount; ++index, ++value) { - if(GetUInt32Value(index) != 0) + if(*value) updateMask->SetBit(index); } } |