Merge branch 'threading_rewrite' of https://github.com/ShinDarth/azerothcore-wotlk into threading_rewrite

This commit is contained in:
Yehonal
2016-08-19 23:54:55 +02:00
36 changed files with 751 additions and 781 deletions

View File

@@ -23,21 +23,21 @@ class guild_commandscript : public CommandScript
public:
guild_commandscript() : CommandScript("guild_commandscript") { }
ChatCommand* GetCommands() const
std::vector<ChatCommand> GetCommands() const override
{
static ChatCommand guildCommandTable[] =
static std::vector<ChatCommand> guildCommandTable =
{
{ "create", SEC_GAMEMASTER, true, &HandleGuildCreateCommand, "", NULL },
{ "delete", SEC_GAMEMASTER, true, &HandleGuildDeleteCommand, "", NULL },
{ "invite", SEC_GAMEMASTER, true, &HandleGuildInviteCommand, "", NULL },
{ "uninvite", SEC_GAMEMASTER, true, &HandleGuildUninviteCommand, "", NULL },
{ "rank", SEC_GAMEMASTER, true, &HandleGuildRankCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
{ "create", SEC_GAMEMASTER, true, &HandleGuildCreateCommand, "" },
{ "delete", SEC_GAMEMASTER, true, &HandleGuildDeleteCommand, "" },
{ "invite", SEC_GAMEMASTER, true, &HandleGuildInviteCommand, "" },
{ "uninvite", SEC_GAMEMASTER, true, &HandleGuildUninviteCommand, "" },
{ "rank", SEC_GAMEMASTER, true, &HandleGuildRankCommand, "" },
{ NULL, 0, false, NULL, "" }
};
static ChatCommand commandTable[] =
static std::vector<ChatCommand> commandTable =
{
{ "guild", SEC_ADMINISTRATOR, true, NULL, "", guildCommandTable },
{ NULL, 0, false, NULL, "", NULL }
{ NULL, 0, false, NULL, "" }
};
return commandTable;
}