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_npc.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_npc.cpp')
| -rw-r--r-- | src/scripts/Commands/cs_npc.cpp | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/src/scripts/Commands/cs_npc.cpp b/src/scripts/Commands/cs_npc.cpp index 35281895c5..8992cd5ac2 100644 --- a/src/scripts/Commands/cs_npc.cpp +++ b/src/scripts/Commands/cs_npc.cpp @@ -63,73 +63,73 @@ class npc_commandscript : public CommandScript public: npc_commandscript() : CommandScript("npc_commandscript") { } - ChatCommand* GetCommands() const + std::vector<ChatCommand> GetCommands() const override { - static ChatCommand npcAddCommandTable[] = + static std::vector<ChatCommand> npcAddCommandTable = { - { "formation", SEC_GAMEMASTER, false, &HandleNpcAddFormationCommand, "", NULL }, - { "item", SEC_GAMEMASTER, false, &HandleNpcAddVendorItemCommand, "", NULL }, - { "move", SEC_GAMEMASTER, false, &HandleNpcAddMoveCommand, "", NULL }, - { "temp", SEC_GAMEMASTER, false, &HandleNpcAddTempSpawnCommand, "", NULL }, + { "formation", SEC_GAMEMASTER, false, &HandleNpcAddFormationCommand, "" }, + { "item", SEC_GAMEMASTER, false, &HandleNpcAddVendorItemCommand, "" }, + { "move", SEC_GAMEMASTER, false, &HandleNpcAddMoveCommand, "" }, + { "temp", SEC_GAMEMASTER, false, &HandleNpcAddTempSpawnCommand, "" }, //{ TODO: fix or remove this command - { "weapon", SEC_ADMINISTRATOR, false, &HandleNpcAddWeaponCommand, "", NULL }, + { "weapon", SEC_ADMINISTRATOR, false, &HandleNpcAddWeaponCommand, "" }, //} - { "", SEC_GAMEMASTER, false, &HandleNpcAddCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "", SEC_GAMEMASTER, false, &HandleNpcAddCommand, "" }, + { NULL, 0, false, NULL, "" } }; - static ChatCommand npcDeleteCommandTable[] = + static std::vector<ChatCommand> npcDeleteCommandTable = { - { "item", SEC_GAMEMASTER, false, &HandleNpcDeleteVendorItemCommand, "", NULL }, - { "", SEC_GAMEMASTER, false, &HandleNpcDeleteCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "item", SEC_GAMEMASTER, false, &HandleNpcDeleteVendorItemCommand, "" }, + { "", SEC_GAMEMASTER, false, &HandleNpcDeleteCommand, "" }, + { NULL, 0, false, NULL, "" } }; - static ChatCommand npcFollowCommandTable[] = + static std::vector<ChatCommand> npcFollowCommandTable = { - { "stop", SEC_GAMEMASTER, false, &HandleNpcUnFollowCommand, "", NULL }, - { "", SEC_GAMEMASTER, false, &HandleNpcFollowCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "stop", SEC_GAMEMASTER, false, &HandleNpcUnFollowCommand, "" }, + { "", SEC_GAMEMASTER, false, &HandleNpcFollowCommand, "" }, + { NULL, 0, false, NULL, "" } }; - static ChatCommand npcSetCommandTable[] = - { - { "allowmove", SEC_ADMINISTRATOR, false, &HandleNpcSetAllowMovementCommand, "", NULL }, - { "entry", SEC_ADMINISTRATOR, false, &HandleNpcSetEntryCommand, "", NULL }, - { "factionid", SEC_GAMEMASTER, false, &HandleNpcSetFactionIdCommand, "", NULL }, - { "flag", SEC_GAMEMASTER, false, &HandleNpcSetFlagCommand, "", NULL }, - { "level", SEC_GAMEMASTER, false, &HandleNpcSetLevelCommand, "", NULL }, - { "link", SEC_GAMEMASTER, false, &HandleNpcSetLinkCommand, "", NULL }, - { "model", SEC_GAMEMASTER, false, &HandleNpcSetModelCommand, "", NULL }, - { "movetype", SEC_GAMEMASTER, false, &HandleNpcSetMoveTypeCommand, "", NULL }, - { "phase", SEC_GAMEMASTER, false, &HandleNpcSetPhaseCommand, "", NULL }, - { "spawndist", SEC_GAMEMASTER, false, &HandleNpcSetSpawnDistCommand, "", NULL }, - { "spawntime", SEC_GAMEMASTER, false, &HandleNpcSetSpawnTimeCommand, "", NULL }, - { "data", SEC_ADMINISTRATOR, false, &HandleNpcSetDataCommand, "", NULL }, + static std::vector<ChatCommand> npcSetCommandTable = + { + { "allowmove", SEC_ADMINISTRATOR, false, &HandleNpcSetAllowMovementCommand, "" }, + { "entry", SEC_ADMINISTRATOR, false, &HandleNpcSetEntryCommand, "" }, + { "factionid", SEC_GAMEMASTER, false, &HandleNpcSetFactionIdCommand, "" }, + { "flag", SEC_GAMEMASTER, false, &HandleNpcSetFlagCommand, "" }, + { "level", SEC_GAMEMASTER, false, &HandleNpcSetLevelCommand, "" }, + { "link", SEC_GAMEMASTER, false, &HandleNpcSetLinkCommand, "" }, + { "model", SEC_GAMEMASTER, false, &HandleNpcSetModelCommand, "" }, + { "movetype", SEC_GAMEMASTER, false, &HandleNpcSetMoveTypeCommand, "" }, + { "phase", SEC_GAMEMASTER, false, &HandleNpcSetPhaseCommand, "" }, + { "spawndist", SEC_GAMEMASTER, false, &HandleNpcSetSpawnDistCommand, "" }, + { "spawntime", SEC_GAMEMASTER, false, &HandleNpcSetSpawnTimeCommand, "" }, + { "data", SEC_ADMINISTRATOR, false, &HandleNpcSetDataCommand, "" }, //{ TODO: fix or remove these commands - { "name", SEC_GAMEMASTER, false, &HandleNpcSetNameCommand, "", NULL }, - { "subname", SEC_GAMEMASTER, false, &HandleNpcSetSubNameCommand, "", NULL }, + { "name", SEC_GAMEMASTER, false, &HandleNpcSetNameCommand, "" }, + { "subname", SEC_GAMEMASTER, false, &HandleNpcSetSubNameCommand, "" }, //} - { NULL, 0, false, NULL, "", NULL } + { NULL, 0, false, NULL, "" } }; - static ChatCommand npcCommandTable[] = - { - { "info", SEC_ADMINISTRATOR, false, &HandleNpcInfoCommand, "", NULL }, - { "near", SEC_GAMEMASTER, false, &HandleNpcNearCommand, "", NULL }, - { "move", SEC_GAMEMASTER, false, &HandleNpcMoveCommand, "", NULL }, - { "playemote", SEC_ADMINISTRATOR, false, &HandleNpcPlayEmoteCommand, "", NULL }, - { "say", SEC_GAMEMASTER, false, &HandleNpcSayCommand, "", NULL }, - { "textemote", SEC_GAMEMASTER, false, &HandleNpcTextEmoteCommand, "", NULL }, - { "whisper", SEC_GAMEMASTER, false, &HandleNpcWhisperCommand, "", NULL }, - { "yell", SEC_GAMEMASTER, false, &HandleNpcYellCommand, "", NULL }, - { "tame", SEC_GAMEMASTER, false, &HandleNpcTameCommand, "", NULL }, + static std::vector<ChatCommand> npcCommandTable = + { + { "info", SEC_ADMINISTRATOR, false, &HandleNpcInfoCommand, "" }, + { "near", SEC_GAMEMASTER, false, &HandleNpcNearCommand, "" }, + { "move", SEC_GAMEMASTER, false, &HandleNpcMoveCommand, "" }, + { "playemote", SEC_ADMINISTRATOR, false, &HandleNpcPlayEmoteCommand, "" }, + { "say", SEC_GAMEMASTER, false, &HandleNpcSayCommand, "" }, + { "textemote", SEC_GAMEMASTER, false, &HandleNpcTextEmoteCommand, "" }, + { "whisper", SEC_GAMEMASTER, false, &HandleNpcWhisperCommand, "" }, + { "yell", SEC_GAMEMASTER, false, &HandleNpcYellCommand, "" }, + { "tame", SEC_GAMEMASTER, false, &HandleNpcTameCommand, "" }, { "add", SEC_GAMEMASTER, false, NULL, "", npcAddCommandTable }, { "delete", SEC_GAMEMASTER, false, NULL, "", npcDeleteCommandTable }, { "follow", SEC_GAMEMASTER, false, NULL, "", npcFollowCommandTable }, { "set", SEC_GAMEMASTER, false, NULL, "", npcSetCommandTable }, - { NULL, 0, false, NULL, "", NULL } + { NULL, 0, false, NULL, "" } }; - static ChatCommand commandTable[] = + static std::vector<ChatCommand> commandTable = { { "npc", SEC_GAMEMASTER, false, NULL, "", npcCommandTable }, - { NULL, 0, false, NULL, "", NULL } + { NULL, 0, false, NULL, "" } }; return commandTable; } |