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/Stratholme | |
| 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/Stratholme')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index b0d5b0508eb..85eabe70cfa 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -72,7 +72,7 @@ class instance_stratholme : public InstanceMapScript std::set<uint64> abomnationGUID; EventMap events; - void Initialize() + void Initialize() OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) EncounterState[i] = NOT_STARTED; @@ -126,7 +126,7 @@ class instance_stratholme : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -146,7 +146,7 @@ class instance_stratholme : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) + void OnCreatureRemove(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -160,7 +160,7 @@ class instance_stratholme : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -353,7 +353,7 @@ class instance_stratholme : public InstanceMapScript SaveToDB(); } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -365,7 +365,7 @@ class instance_stratholme : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { @@ -426,7 +426,7 @@ class instance_stratholme : public InstanceMapScript return 0; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { events.Update(diff); |