Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/game/Entities/Player/Player.h
This commit is contained in:
Vincent-Michael
2014-09-22 06:41:14 +02:00
parent 1bd700284f ec59c3ab03
commit 15520e38d0
72 changed files with 1453 additions and 1775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/server/game/Scripting/ScriptLoader.cpp
View File

@@ -18,13 +18,6 @@
#include "ScriptLoader.h"
#include "World.h"
//examples
void AddSC_example_creature();
void AddSC_example_escort();
void AddSC_example_gossip_codebox();
void AddSC_example_misc();
void AddSC_example_commandscript();
// spells
void AddSC_deathknight_spell_scripts();
void AddSC_druid_spell_scripts();
@@ -39,7 +32,6 @@ void AddSC_warlock_spell_scripts();
void AddSC_warrior_spell_scripts();
void AddSC_quest_spell_scripts();
void AddSC_item_spell_scripts();
void AddSC_example_spell_scripts();
void AddSC_holiday_spell_scripts();
void AddSC_SmartScripts();
@@ -714,7 +706,6 @@ void AddSC_action_ip_logger();
void AddScripts()
{
AddExampleScripts();
AddSpellScripts();
AddSC_SmartScripts();
AddCommandScripts();
@@ -733,15 +724,6 @@ void AddScripts()
#endif
}
void AddExampleScripts()
{
AddSC_example_creature();
AddSC_example_escort();
AddSC_example_gossip_codebox();
AddSC_example_misc();
AddSC_example_commandscript();
}
void AddSpellScripts()
{
AddSC_deathknight_spell_scripts();
@@ -757,7 +739,6 @@ void AddSpellScripts()
AddSC_warrior_spell_scripts();
AddSC_quest_spell_scripts();
AddSC_item_spell_scripts();
AddSC_example_spell_scripts();
AddSC_holiday_spell_scripts();
}