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/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/server/worldserver/worldserver.conf.dist
This commit is contained in:
Vincent-Michael committed 2013-08-30 21:43:02 +02:00
commit 224c5c5d3d
71 files changed
+1324 -942

No files matched your search

+8 -8
View File
@@ -38,18 +38,18 @@ public:
{
static ChatCommand wpCommandTable[] =
{
{ "add", SEC_GAMEMASTER, false, &HandleWpAddCommand, "", NULL },
{ "event", SEC_GAMEMASTER, false, &HandleWpEventCommand, "", NULL },
{ "load", SEC_GAMEMASTER, false, &HandleWpLoadCommand, "", NULL },
{ "modify", SEC_GAMEMASTER, false, &HandleWpModifyCommand, "", NULL },
{ "unload", SEC_GAMEMASTER, false, &HandleWpUnLoadCommand, "", NULL },
{ "reload", SEC_ADMINISTRATOR, false, &HandleWpReloadCommand, "", NULL },
{ "show", SEC_GAMEMASTER, false, &HandleWpShowCommand, "", NULL },
{ "add", RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleWpAddCommand, "", NULL },
{ "event", RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleWpEventCommand, "", NULL },
{ "load", RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleWpLoadCommand, "", NULL },
{ "modify", RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleWpModifyCommand, "", NULL },
{ "unload", RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleWpUnLoadCommand, "", NULL },
{ "reload", RBAC_PERM_ADMINISTRATOR_COMMANDS, false, &HandleWpReloadCommand, "", NULL },
{ "show", RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleWpShowCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand commandTable[] =
{
{ "wp", SEC_GAMEMASTER, false, NULL, "", wpCommandTable },
{ "wp", RBAC_PERM_GAMEMASTER_COMMANDS, false, NULL, "", wpCommandTable },
{ NULL, 0, false, NULL, "", NULL }
};
return commandTable;