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:
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
This commit is contained in:
Vincent-Michael
2014-06-23 23:47:48 +02:00
parent 9bac986f35 aa93a97546
commit d8234bed42
65 changed files with 4489 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
*/
#include "ScriptLoader.h"
#include "World.h"
//examples
void AddSC_example_creature();
@@ -41,7 +42,7 @@ void AddSC_item_spell_scripts();
void AddSC_example_spell_scripts();
void AddSC_holiday_spell_scripts();
void AddSC_SmartSCripts();
void AddSC_SmartScripts();
//Commands
void AddSC_account_commandscript();
@@ -98,6 +99,7 @@ void AddSC_npc_innkeeper();
void AddSC_npcs_special();
void AddSC_npc_taxi();
void AddSC_achievement_scripts();
void AddSC_action_ip_logger();
//eastern kingdoms
void AddSC_alterac_valley(); //Alterac Valley
@@ -701,6 +703,7 @@ void AddSC_outdoorpvp_zm();
// player
void AddSC_chat_log();
void AddSC_action_ip_logger();
#endif
@@ -708,7 +711,7 @@ void AddScripts()
{
AddExampleScripts();
AddSpellScripts();
AddSC_SmartSCripts();
AddSC_SmartScripts();
AddCommandScripts();
#ifdef SCRIPTS
AddWorldScripts();
@@ -811,7 +814,10 @@ void AddWorldScripts()
AddSC_npcs_special();
AddSC_npc_taxi();
AddSC_achievement_scripts();
AddSC_chat_log();
AddSC_chat_log(); // location: scripts\World\chat_log.cpp
// To avoid duplicate code, we check once /*ONLY*/ if logging is permitted or not.
if (sWorld->getBoolConfig(CONFIG_IP_BASED_ACTION_LOGGING))
AddSC_action_ip_logger(); // location: scripts\World\action_ip_logger.cpp
#endif
}