diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-09-14 23:23:23 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-09-14 23:23:23 +0200 |
| commit | 56f46e3ce543af8ffdc708eaa4ceecc173a5eb29 (patch) | |
| tree | 90922cd7f1177a7fb6601812f7e9212765a89765 /src/server/scripts/EasternKingdoms/Deadmines | |
| parent | d72c4085de0b2ac0ff3bee24a5dae80c0d5dac2c (diff) | |
Scripts
* Introduced GetGuidData/SetGuidData to store guids in instance scripts (GetData64/SetData64 are still there)
* CONDITION_INSTANCE_INFO: Changed existing DATA64 condition to GUID_DATA to preserve current use of this instance info type (most/all assume the data is a guid) and moved DATA64 to a different value - no db changes needed
* Fixed compile in boss scripts starting with letter A
Diffstat (limited to 'src/server/scripts/EasternKingdoms/Deadmines')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 7338620a8b2..029c3f08a8d 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -133,7 +133,7 @@ public: ++uiHealth; DoCastAOE(SPELL_SMITE_STOMP, false); SetCombatMovement(false); - if (GameObject* go = ObjectAccessor::GetGameObject(*me, instance->GetData64(DATA_SMITE_CHEST))) + if (GameObject* go = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(DATA_SMITE_CHEST))) { me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MovePoint(1, go->GetPositionX() - 3.0f, go->GetPositionY(), go->GetPositionZ()); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 5de561598f1..1ec17b32b0d 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -220,7 +220,7 @@ class instance_deadmines : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const override + ObjectGuid GetGuidData(uint32 data) const override { switch (data) { |