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

@@ -21,18 +21,18 @@ class achievement_commandscript : public CommandScript
public:
achievement_commandscript() : CommandScript("achievement_commandscript") { }
ChatCommand* GetCommands() const
std::vector<ChatCommand> GetCommands() const override
{
static ChatCommand achievementCommandTable[] =
static std::vector<ChatCommand> achievementCommandTable =
{
{ "add", SEC_ADMINISTRATOR, false, &HandleAchievementAddCommand, "", NULL },
{ "checkall", SEC_ADMINISTRATOR, false, &HandleAchievementCheckAllCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
{ "add", SEC_ADMINISTRATOR, false, &HandleAchievementAddCommand, "" },
{ "checkall", SEC_ADMINISTRATOR, false, &HandleAchievementCheckAllCommand, "" },
{ NULL, 0, false, NULL, "" }
};
static ChatCommand commandTable[] =
static std::vector<ChatCommand> commandTable =
{
{ "achievement", SEC_ADMINISTRATOR, false, NULL, "", achievementCommandTable },
{ NULL, 0, false, NULL, "", NULL }
{ NULL, 0, false, NULL, "" }
};
return commandTable;
}