nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 17:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yehonal
2016-08-19 23:54:55 +02:00
parent 8ee36c5f64 cb30a6b404
commit ee0ead5e4f
36 changed files with 751 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/scripts/Commands/cs_npc.cpp
View File

@@ -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[] =
static std::vector<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 },
{ "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[] =
static std::vector<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 },
{ "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;
}