diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-10 17:58:53 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-10 17:58:53 +0200 |
| commit | bb9614d00decb362f5a2e8465443fc3bd19bf706 (patch) | |
| tree | 839ca1f981b6c8c4c467906977af1c07b5572447 /src/server/scripts/EasternKingdoms/ZulAman | |
| parent | 16b8bce3346588700ac6ec9ff977f79d4021ed6e (diff) | |
| parent | 8acefbff8c2b16d6c4316f931616e7c7efd49537 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ZulAman')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index c34c064fc3e..70eb6d3f7e1 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -44,13 +44,13 @@ class instance_zulaman : public InstanceMapScript ZulAmanBossCount = 0; } - void FillInitialWorldStates(WorldPacket& packet) + void FillInitialWorldStates(WorldPacket& packet) OVERRIDE { packet << uint32(WORLD_STATE_ZULAMAN_TIMER_ENABLED) << uint32(ZulAmanState ? 1 : 0); packet << uint32(WORLD_STATE_ZULAMAN_TIMER) << uint32(SpeedRunTimer); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -83,7 +83,7 @@ class instance_zulaman : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -101,7 +101,7 @@ class instance_zulaman : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) + void OnGameObjectRemove(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -177,7 +177,7 @@ class instance_zulaman : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -221,7 +221,7 @@ class instance_zulaman : public InstanceMapScript return true; } - void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) + void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) OVERRIDE { switch (eventId) { @@ -266,7 +266,7 @@ class instance_zulaman : public InstanceMapScript } } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -278,7 +278,7 @@ class instance_zulaman : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) + void Load(char const* str) OVERRIDE { if (!str) { |