diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-07 20:07:05 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-07 20:07:05 +0200 |
| commit | 2daa8ed56f430fd4f4dcc0171519f1793d00ae79 (patch) | |
| tree | 9f64246026504e8f4db76bbd7888168e9b4afa91 /src/server/game/Scripting | |
| parent | c0fc0f237f7e85ab3c5cc422fea7a1000fa72b23 (diff) | |
| parent | 1e8fd6489d67fa3e0ed73c7391970cd9a9e74383 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Spells/spell_generic.cpp
Diffstat (limited to 'src/server/game/Scripting')
| -rw-r--r-- | src/server/game/Scripting/ScriptLoader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 6e86b79a38c..8253516867b 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -129,6 +129,7 @@ void AddSC_boss_gyth(); void AddSC_boss_rend_blackhand(); void AddSC_boss_gizrul_the_slavener(); void AddSC_boss_urok_doomhowl(); +void AddSC_boss_lord_valthalak(); void AddSC_instance_blackrock_spire(); void AddSC_boss_razorgore(); //Blackwing lair void AddSC_boss_vaelastrasz(); @@ -777,6 +778,7 @@ void AddEasternKingdomsScripts() AddSC_boss_rend_blackhand(); AddSC_boss_gizrul_the_slavener(); AddSC_boss_urok_doomhowl(); + AddSC_boss_lord_valthalak(); AddSC_instance_blackrock_spire(); AddSC_boss_razorgore(); //Blackwing lair AddSC_boss_vaelastrasz(); |