diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-10 01:08:55 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-10 01:08:55 +0100 |
| commit | a9b740ab747332dde2967426027c43f98efbebac (patch) | |
| tree | 04f3999dd51a9eb2d7811f751dad124242390fb8 /src/server/scripts/Outland/TempestKeep | |
| parent | 83a5043741c0ef3d96ff59571305eae30d360ed5 (diff) | |
| parent | f3617abdba8c247d4e9f423e5e97e3b42dab7b41 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'src/server/scripts/Outland/TempestKeep')
| -rw-r--r-- | src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 4a2026a4ed1..5e29a8d0c31 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -103,7 +103,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript break; case EVENT_JACKHAMMER: Talk(EMOTE_HAMMER); - //TODO: expect cast this about 5 times in a row (?), announce it by emote only once + /// @todo expect cast this about 5 times in a row (?), announce it by emote only once DoCastVictim(SPELL_JACKHAMMER, true); if (roll_chance_i(50)) Talk(SAY_HAMMER); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 0b52b705753..2fc0b475cdf 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Arcatraz SD%Complete: 60 -SDComment: Warden Mellichar, event controller for Skyriss event. Millhouse Manastorm. TODO: make better combatAI for Millhouse. +SDComment: Warden Mellichar, event controller for Skyriss event. Millhouse Manastorm. @todo make better combatAI for Millhouse. SDCategory: Tempest Keep, The Arcatraz EndScriptData */ |