diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-05-30 19:34:25 +0200 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2015-05-30 19:34:25 +0200 |
| commit | 0cf02097414ddf7a370bd2efef5b892616e8de93 (patch) | |
| tree | 85fb8e5581cdb171785fd8e2c3073199d7ca4bd1 /src/server/scripts/EasternKingdoms | |
| parent | 12d59623fff5fe88d2fff0e8ddcabad7bec62c71 (diff) | |
| parent | b6e926fa2f3f894e9b1d9d38e45390235ae749d5 (diff) | |
Merge pull request #14782 from doctaweeks/fixes-for-6.x
Minor fixes for 6.x
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 1d7e1594d05..ca944f7037b 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -102,7 +102,7 @@ public: } } - virtual void Update(uint32 /*diff*/) // correct order goes form 1-6 + virtual void Update(uint32 /*diff*/) override // correct order goes form 1-6 { switch (State) { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index ec2f41cc625..15280bc7848 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -197,7 +197,7 @@ class boss_archaedas : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied (Unit* /*killer*/) + void JustDied (Unit* /*killer*/) override { instance->SetData(DATA_ANCIENT_DOOR, DONE); // open the vault door instance->SetData(DATA_MINIONS, SPECIAL); // deactivate his minions |