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

@@ -24,21 +24,21 @@ class tele_commandscript : public CommandScript
public:
tele_commandscript() : CommandScript("tele_commandscript") { }
ChatCommand* GetCommands() const
std::vector<ChatCommand> GetCommands() const override
{
static ChatCommand teleCommandTable[] =
static std::vector<ChatCommand> teleCommandTable =
{
{ "add", SEC_ADMINISTRATOR, false, &HandleTeleAddCommand, "", NULL },
{ "del", SEC_ADMINISTRATOR, true, &HandleTeleDelCommand, "", NULL },
{ "name", SEC_GAMEMASTER, true, &HandleTeleNameCommand, "", NULL },
{ "group", SEC_GAMEMASTER, false, &HandleTeleGroupCommand, "", NULL },
{ "", SEC_GAMEMASTER, false, &HandleTeleCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
{ "add", SEC_ADMINISTRATOR, false, &HandleTeleAddCommand, "" },
{ "del", SEC_ADMINISTRATOR, true, &HandleTeleDelCommand, "" },
{ "name", SEC_GAMEMASTER, true, &HandleTeleNameCommand, "" },
{ "group", SEC_GAMEMASTER, false, &HandleTeleGroupCommand, "" },
{ "", SEC_GAMEMASTER, false, &HandleTeleCommand, "" },
{ NULL, 0, false, NULL, "" }
};
static ChatCommand commandTable[] =
static std::vector<ChatCommand> commandTable =
{
{ "tele", SEC_GAMEMASTER, false, NULL, "", teleCommandTable },
{ NULL, 0, false, NULL, "", NULL }
{ NULL, 0, false, NULL, "" }
};
return commandTable;
}