diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2016-08-19 23:54:55 +0200 |
|---|---|---|
| committer | Yehonal <yehonal.azeroth@gmail.com> | 2016-08-19 23:54:55 +0200 |
| commit | ee0ead5e4fbc83e33d8964e6ea4cac180654510f (patch) | |
| tree | 9bb93e3e1b8a76ab76b43a84b2d965395ac340d8 /src/scripts/Commands/cs_gobject.cpp | |
| parent | 8ee36c5f642a9c4ac1d6dd45ec918a73e59d83f9 (diff) | |
| parent | cb30a6b4043737957aa1d1bca27601c6577a80ec (diff) | |
Merge branch 'threading_rewrite' of https://github.com/ShinDarth/azerothcore-wotlk into threading_rewrite
Diffstat (limited to 'src/scripts/Commands/cs_gobject.cpp')
| -rw-r--r-- | src/scripts/Commands/cs_gobject.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/scripts/Commands/cs_gobject.cpp b/src/scripts/Commands/cs_gobject.cpp index abad33464d..465a491f41 100644 --- a/src/scripts/Commands/cs_gobject.cpp +++ b/src/scripts/Commands/cs_gobject.cpp @@ -28,37 +28,37 @@ class gobject_commandscript : public CommandScript public: gobject_commandscript() : CommandScript("gobject_commandscript") { } - ChatCommand* GetCommands() const + std::vector<ChatCommand> GetCommands() const override { - static ChatCommand gobjectAddCommandTable[] = + static std::vector<ChatCommand> gobjectAddCommandTable = { - { "temp", SEC_GAMEMASTER, false, &HandleGameObjectAddTempCommand, "", NULL }, - { "", SEC_GAMEMASTER, false, &HandleGameObjectAddCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "temp", SEC_GAMEMASTER, false, &HandleGameObjectAddTempCommand, "" }, + { "", SEC_GAMEMASTER, false, &HandleGameObjectAddCommand, "" }, + { NULL, 0, false, NULL, "" } }; - static ChatCommand gobjectSetCommandTable[] = + static std::vector<ChatCommand> gobjectSetCommandTable = { - { "phase", SEC_GAMEMASTER, false, &HandleGameObjectSetPhaseCommand, "", NULL }, - { "state", SEC_GAMEMASTER, false, &HandleGameObjectSetStateCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "phase", SEC_GAMEMASTER, false, &HandleGameObjectSetPhaseCommand, "" }, + { "state", SEC_GAMEMASTER, false, &HandleGameObjectSetStateCommand, "" }, + { NULL, 0, false, NULL, "" } }; - static ChatCommand gobjectCommandTable[] = - { - { "activate", SEC_GAMEMASTER, false, &HandleGameObjectActivateCommand, "", NULL }, - { "delete", SEC_GAMEMASTER, false, &HandleGameObjectDeleteCommand, "", NULL }, - { "info", SEC_GAMEMASTER, false, &HandleGameObjectInfoCommand, "", NULL }, - { "move", SEC_GAMEMASTER, false, &HandleGameObjectMoveCommand, "", NULL }, - { "near", SEC_GAMEMASTER, false, &HandleGameObjectNearCommand, "", NULL }, - { "target", SEC_GAMEMASTER, false, &HandleGameObjectTargetCommand, "", NULL }, - { "turn", SEC_GAMEMASTER, false, &HandleGameObjectTurnCommand, "", NULL }, + static std::vector<ChatCommand> gobjectCommandTable = + { + { "activate", SEC_GAMEMASTER, false, &HandleGameObjectActivateCommand, "" }, + { "delete", SEC_GAMEMASTER, false, &HandleGameObjectDeleteCommand, "" }, + { "info", SEC_GAMEMASTER, false, &HandleGameObjectInfoCommand, "" }, + { "move", SEC_GAMEMASTER, false, &HandleGameObjectMoveCommand, "" }, + { "near", SEC_GAMEMASTER, false, &HandleGameObjectNearCommand, "" }, + { "target", SEC_GAMEMASTER, false, &HandleGameObjectTargetCommand, "" }, + { "turn", SEC_GAMEMASTER, false, &HandleGameObjectTurnCommand, "" }, { "add", SEC_GAMEMASTER, false, NULL, "", gobjectAddCommandTable }, { "set", SEC_GAMEMASTER, false, NULL, "", gobjectSetCommandTable }, - { NULL, 0, false, NULL, "", NULL } + { NULL, 0, false, NULL, "" } }; - static ChatCommand commandTable[] = + static std::vector<ChatCommand> commandTable = { { "gobject", SEC_GAMEMASTER, false, NULL, "", gobjectCommandTable }, - { NULL, 0, false, NULL, "", NULL } + { NULL, 0, false, NULL, "" } }; return commandTable; } |