diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-19 18:57:36 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-19 18:57:36 +0100 |
| commit | 0c1689077401ced1e09c95ed6518645dacf5da8f (patch) | |
| tree | e43dfd8d062a4505d40cae43a97675c2d8a9b882 /src/server/scripts/Events | |
| parent | 71eaceae5de6cc1c517bec78d0ef52e149a59b6e (diff) | |
| parent | 5b414bb81343c7b9fad9f3974021ff0c9e1c739a (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/CreatureEventAI.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
Diffstat (limited to 'src/server/scripts/Events')
| -rw-r--r-- | src/server/scripts/Events/childrens_week.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 9d35b510f6e..4541e160e63 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -173,7 +173,7 @@ class npc_winterfin_playmate : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!phase) return; @@ -271,7 +271,7 @@ class npc_snowfall_glade_playmate : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!phase) return; @@ -371,7 +371,7 @@ class npc_the_biggest_tree : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!phase) return; @@ -457,7 +457,7 @@ class npc_high_oracle_soo_roo : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!phase) return; @@ -545,7 +545,7 @@ class npc_elder_kekek : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!phase) return; @@ -633,7 +633,7 @@ class npc_the_etymidian : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!phase) return; @@ -755,7 +755,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!phase) return; |