Some command handlers renames and declaration sorting.

This commit is contained in:
VladimirMangos 2008-10-30 05:03:57 +03:00
parent 42cf4db28b
commit 83f034ae5d
5 changed files with 76 additions and 76 deletions

View file

@ -357,28 +357,28 @@ ChatCommand * ChatHandler::getCommandTable()
static ChatCommand npcCommandTable[] = static ChatCommand npcCommandTable[] =
{ {
{ "say", SEC_MODERATOR, false, &ChatHandler::HandleSayCommand, "", NULL }, { "say", SEC_MODERATOR, false, &ChatHandler::HandleNpcSayCommand, "", NULL },
{ "whisper", SEC_MODERATOR, false, &ChatHandler::HandleNpcWhisperCommand, "", NULL }, { "textemote", SEC_MODERATOR, false, &ChatHandler::HandleNpcTextEmoteCommand, "", NULL },
{ "yell", SEC_MODERATOR, false, &ChatHandler::HandleYellCommand, "", NULL }, { "add", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcAddCommand, "", NULL },
{ "textemote", SEC_MODERATOR, false, &ChatHandler::HandleTextEmoteCommand, "", NULL }, { "delete", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcDeleteCommand, "", NULL },
{ "add", SEC_GAMEMASTER, false, &ChatHandler::HandleAddSpwCommand, "", NULL }, { "spawndist", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcSpawnDistCommand, "", NULL },
{ "delete", SEC_GAMEMASTER, false, &ChatHandler::HandleDelCreatureCommand, "", NULL }, { "spawntime", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcSpawnTimeCommand, "", NULL },
{ "spawndist", SEC_GAMEMASTER, false, &ChatHandler::HandleSpawnDistCommand, "", NULL }, { "factionid", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcFactionIdCommand, "", NULL },
{ "spawntime", SEC_GAMEMASTER, false, &ChatHandler::HandleSpawnTimeCommand, "", NULL }, { "addmove", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcAddMoveCommand, "", NULL },
{ "factionid", SEC_GAMEMASTER, false, &ChatHandler::HandleFactionIdCommand, "", NULL }, { "setmovetype", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcSetMoveTypeCommand, "", NULL },
{ "addmove", SEC_GAMEMASTER, false, &ChatHandler::HandleAddMoveCommand, "", NULL }, { "move", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcMoveCommand, "", NULL },
{ "setmovetype", SEC_GAMEMASTER, false, &ChatHandler::HandleSetMoveTypeCommand, "", NULL },
{ "move", SEC_GAMEMASTER, false, &ChatHandler::HandleMoveCreatureCommand, "", NULL },
{ "changelevel", SEC_GAMEMASTER, false, &ChatHandler::HandleChangeLevelCommand, "", NULL }, { "changelevel", SEC_GAMEMASTER, false, &ChatHandler::HandleChangeLevelCommand, "", NULL },
{ "setmodel", SEC_GAMEMASTER, false, &ChatHandler::HandleSetModelCommand, "", NULL }, { "setmodel", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcSetModelCommand, "", NULL },
{ "additem", SEC_GAMEMASTER, false, &ChatHandler::HandleAddVendorItemCommand, "", NULL }, { "additem", SEC_GAMEMASTER, false, &ChatHandler::HandleAddVendorItemCommand, "", NULL },
{ "delitem", SEC_GAMEMASTER, false, &ChatHandler::HandleDelVendorItemCommand, "", NULL }, { "delitem", SEC_GAMEMASTER, false, &ChatHandler::HandleDelVendorItemCommand, "", NULL },
{ "flag", SEC_GAMEMASTER, false, &ChatHandler::HandleNPCFlagCommand, "", NULL }, { "flag", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcFlagCommand, "", NULL },
{ "changeentry", SEC_ADMINISTRATOR, false, &ChatHandler::HandleChangeEntryCommand, "", NULL }, { "changeentry", SEC_ADMINISTRATOR, false, &ChatHandler::HandleNpcChangeEntryCommand, "", NULL },
{ "info", SEC_ADMINISTRATOR, false, &ChatHandler::HandleNpcInfoCommand, "", NULL }, { "info", SEC_ADMINISTRATOR, false, &ChatHandler::HandleNpcInfoCommand, "", NULL },
{ "playemote", SEC_ADMINISTRATOR, false, &ChatHandler::HandlePlayEmoteCommand, "", NULL }, { "playemote", SEC_ADMINISTRATOR, false, &ChatHandler::HandleNpcPlayEmoteCommand, "", NULL },
{ "follow", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcFollowCommand, "", NULL }, { "follow", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcFollowCommand, "", NULL },
{ "unfollow", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcUnFollowCommand, "", NULL }, { "unfollow", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcUnFollowCommand, "", NULL },
{ "whisper", SEC_MODERATOR, false, &ChatHandler::HandleNpcWhisperCommand, "", NULL },
{ "yell", SEC_MODERATOR, false, &ChatHandler::HandleNpcYellCommand, "", NULL },
//{ TODO: fix or remove this commands //{ TODO: fix or remove this commands
{ "name", SEC_GAMEMASTER, false, &ChatHandler::HandleNameCommand, "", NULL }, { "name", SEC_GAMEMASTER, false, &ChatHandler::HandleNameCommand, "", NULL },

View file

@ -114,10 +114,6 @@ class ChatHandler
bool HandleGPSCommand(const char* args); bool HandleGPSCommand(const char* args);
bool HandleTaxiCheatCommand(const char* args); bool HandleTaxiCheatCommand(const char* args);
bool HandleWhispersCommand(const char* args); bool HandleWhispersCommand(const char* args);
bool HandleSayCommand(const char* args);
bool HandleNpcWhisperCommand(const char* args);
bool HandleYellCommand(const char* args);
bool HandlePlayEmoteCommand(const char* args);
bool HandleSendMailCommand(const char* args); bool HandleSendMailCommand(const char* args);
bool HandleNameTeleCommand(const char* args); bool HandleNameTeleCommand(const char* args);
bool HandleGroupTeleCommand(const char* args); bool HandleGroupTeleCommand(const char* args);
@ -128,6 +124,32 @@ class ChatHandler
bool HandleEventStopCommand(const char* args); bool HandleEventStopCommand(const char* args);
bool HandleEventInfoCommand(const char* args); bool HandleEventInfoCommand(const char* args);
bool HandleLearnCommand(const char* args);
bool HandleLearnAllCommand(const char* args);
bool HandleLearnAllGMCommand(const char* args);
bool HandleLearnAllCraftsCommand(const char* args);
bool HandleLearnAllRecipesCommand(const char* args);
bool HandleLearnAllDefaultCommand(const char* args);
bool HandleLearnAllLangCommand(const char* args);
bool HandleLearnAllMyClassCommand(const char* args);
bool HandleLearnAllMySpellsCommand(const char* args);
bool HandleLearnAllMyTalentsCommand(const char* args);
bool HandleLookupAreaCommand(const char* args);
bool HandleLookupCreatureCommand(const char* args);
bool HandleLookupEventCommand(const char* args);
bool HandleLookupFactionCommand(const char * args);
bool HandleLookupItemCommand(const char * args);
bool HandleLookupItemSetCommand(const char * args);
bool HandleLookupObjectCommand(const char* args);
bool HandleLookupPlayerIpCommand(const char* args);
bool HandleLookupPlayerAccountCommand(const char* args);
bool HandleLookupPlayerEmailCommand(const char* args);
bool HandleLookupQuestCommand(const char* args);
bool HandleLookupSkillCommand(const char* args);
bool HandleLookupSpellCommand(const char* args);
bool HandleLookupTeleCommand(const char * args);
bool HandleModifyKnownTitlesCommand(const char* args); bool HandleModifyKnownTitlesCommand(const char* args);
bool HandleModifyHPCommand(const char* args); bool HandleModifyHPCommand(const char* args);
bool HandleModifyManaCommand(const char* args); bool HandleModifyManaCommand(const char* args);
@ -149,8 +171,25 @@ class ChatHandler
bool HandleModifyRepCommand(const char* args); bool HandleModifyRepCommand(const char* args);
bool HandleModifyArenaCommand(const char* args); bool HandleModifyArenaCommand(const char* args);
bool HandleNpcAddCommand(const char* args);
bool HandleNpcAddMoveCommand(const char* args);
bool HandleNpcChangeEntryCommand(const char *args);
bool HandleNpcDeleteCommand(const char* args);
bool HandleNpcFactionIdCommand(const char* args);
bool HandleNpcFlagCommand(const char* args);
bool HandleNpcFollowCommand(const char* args); bool HandleNpcFollowCommand(const char* args);
bool HandleNpcInfoCommand(const char* args);
bool HandleNpcMoveCommand(const char* args);
bool HandleNpcPlayEmoteCommand(const char* args);
bool HandleNpcSayCommand(const char* args);
bool HandleNpcSetModelCommand(const char* args);
bool HandleNpcSetMoveTypeCommand(const char* args);
bool HandleNpcSpawnDistCommand(const char* args);
bool HandleNpcSpawnTimeCommand(const char* args);
bool HandleNpcTextEmoteCommand(const char* args);
bool HandleNpcUnFollowCommand(const char* args); bool HandleNpcUnFollowCommand(const char* args);
bool HandleNpcWhisperCommand(const char* args);
bool HandleNpcYellCommand(const char* args);
bool HandleReloadCommand(const char* args); bool HandleReloadCommand(const char* args);
bool HandleReloadAllCommand(const char* args); bool HandleReloadAllCommand(const char* args);
@ -245,28 +284,18 @@ class ChatHandler
bool HandleNameCommand(const char* args); bool HandleNameCommand(const char* args);
bool HandleSubNameCommand(const char* args); bool HandleSubNameCommand(const char* args);
bool HandleItemMoveCommand(const char* args); bool HandleItemMoveCommand(const char* args);
bool HandleDelCreatureCommand(const char* args);
bool HandleDeMorphCommand(const char* args); bool HandleDeMorphCommand(const char* args);
bool HandleAddVendorItemCommand(const char* args); bool HandleAddVendorItemCommand(const char* args);
bool HandleDelVendorItemCommand(const char* args); bool HandleDelVendorItemCommand(const char* args);
bool HandleAddMoveCommand(const char* args);
bool HandleSetMoveTypeCommand(const char* args);
bool HandleChangeLevelCommand(const char* args); bool HandleChangeLevelCommand(const char* args);
bool HandleSetPoiCommand(const char* args); bool HandleSetPoiCommand(const char* args);
bool HandleEquipErrorCommand(const char* args); bool HandleEquipErrorCommand(const char* args);
bool HandleNPCFlagCommand(const char* args);
bool HandleSetModelCommand(const char* args);
bool HandleFactionIdCommand(const char* args);
bool HandleAddSpwCommand(const char* args);
bool HandleSpawnDistCommand(const char* args);
bool HandleSpawnTimeCommand(const char* args);
bool HandleGoCreatureCommand(const char* args); bool HandleGoCreatureCommand(const char* args);
bool HandleGoObjectCommand(const char* args); bool HandleGoObjectCommand(const char* args);
bool HandleGoTriggerCommand(const char* args); bool HandleGoTriggerCommand(const char* args);
bool HandleGoGraveyardCommand(const char* args); bool HandleGoGraveyardCommand(const char* args);
bool HandleTargetObjectCommand(const char* args); bool HandleTargetObjectCommand(const char* args);
bool HandleDelObjectCommand(const char* args); bool HandleDelObjectCommand(const char* args);
bool HandleMoveCreatureCommand(const char* args);
bool HandleMoveObjectCommand(const char* args); bool HandleMoveObjectCommand(const char* args);
bool HandleTurnObjectCommand(const char* args); bool HandleTurnObjectCommand(const char* args);
bool HandlePInfoCommand(const char* args); bool HandlePInfoCommand(const char* args);
@ -300,32 +329,6 @@ class ChatHandler
bool HandleAllowMovementCommand(const char* args); bool HandleAllowMovementCommand(const char* args);
bool HandleGoCommand(const char* args); bool HandleGoCommand(const char* args);
bool HandleLearnCommand(const char* args);
bool HandleLearnAllCommand(const char* args);
bool HandleLearnAllGMCommand(const char* args);
bool HandleLearnAllCraftsCommand(const char* args);
bool HandleLearnAllRecipesCommand(const char* args);
bool HandleLearnAllDefaultCommand(const char* args);
bool HandleLearnAllLangCommand(const char* args);
bool HandleLearnAllMyClassCommand(const char* args);
bool HandleLearnAllMySpellsCommand(const char* args);
bool HandleLearnAllMyTalentsCommand(const char* args);
bool HandleLookupAreaCommand(const char* args);
bool HandleLookupCreatureCommand(const char* args);
bool HandleLookupEventCommand(const char* args);
bool HandleLookupFactionCommand(const char * args);
bool HandleLookupItemCommand(const char * args);
bool HandleLookupItemSetCommand(const char * args);
bool HandleLookupObjectCommand(const char* args);
bool HandleLookupPlayerIpCommand(const char* args);
bool HandleLookupPlayerAccountCommand(const char* args);
bool HandleLookupPlayerEmailCommand(const char* args);
bool HandleLookupQuestCommand(const char* args);
bool HandleLookupSkillCommand(const char* args);
bool HandleLookupSpellCommand(const char* args);
bool HandleLookupTeleCommand(const char * args);
bool HandleCooldownCommand(const char* args); bool HandleCooldownCommand(const char* args);
bool HandleUnLearnCommand(const char* args); bool HandleUnLearnCommand(const char* args);
bool HandleGetDistanceCommand(const char* args); bool HandleGetDistanceCommand(const char* args);
@ -342,8 +345,6 @@ class ChatHandler
bool HandleLinkGraveCommand(const char* args); bool HandleLinkGraveCommand(const char* args);
bool HandleNearGraveCommand(const char* args); bool HandleNearGraveCommand(const char* args);
bool HandleExploreCheatCommand(const char* args); bool HandleExploreCheatCommand(const char* args);
bool HandleTextEmoteCommand(const char* args);
bool HandleNpcInfoCommand(const char* args);
bool HandleHoverCommand(const char* args); bool HandleHoverCommand(const char* args);
bool HandleLevelUpCommand(const char* args); bool HandleLevelUpCommand(const char* args);
bool HandleShowAreaCommand(const char* args); bool HandleShowAreaCommand(const char* args);
@ -400,7 +401,6 @@ class ChatHandler
bool HandleRenameCommand(const char * args); bool HandleRenameCommand(const char * args);
bool HandleLoadPDumpCommand(const char *args); bool HandleLoadPDumpCommand(const char *args);
bool HandleWritePDumpCommand(const char *args); bool HandleWritePDumpCommand(const char *args);
bool HandleChangeEntryCommand(const char *args);
bool HandleCastCommand(const char *args); bool HandleCastCommand(const char *args);
bool HandleCastBackCommand(const char *args); bool HandleCastBackCommand(const char *args);
bool HandleCastDistCommand(const char *args); bool HandleCastDistCommand(const char *args);

View file

@ -36,7 +36,7 @@
#include "VMapFactory.h" #include "VMapFactory.h"
#endif #endif
bool ChatHandler::HandleSayCommand(const char* args) bool ChatHandler::HandleNpcSayCommand(const char* args)
{ {
if(!*args) if(!*args)
return false; return false;
@ -54,7 +54,7 @@ bool ChatHandler::HandleSayCommand(const char* args)
return true; return true;
} }
bool ChatHandler::HandleYellCommand(const char* args) bool ChatHandler::HandleNpcYellCommand(const char* args)
{ {
if(!*args) if(!*args)
return false; return false;
@ -73,7 +73,7 @@ bool ChatHandler::HandleYellCommand(const char* args)
} }
//show text emote by creature in chat //show text emote by creature in chat
bool ChatHandler::HandleTextEmoteCommand(const char* args) bool ChatHandler::HandleNpcTextEmoteCommand(const char* args)
{ {
if(!*args) if(!*args)
return false; return false;

View file

@ -871,7 +871,7 @@ bool ChatHandler::HandleItemMoveCommand(const char* args)
} }
//add spawn of creature //add spawn of creature
bool ChatHandler::HandleAddSpwCommand(const char* args) bool ChatHandler::HandleNpcAddCommand(const char* args)
{ {
if(!*args) if(!*args)
return false; return false;
@ -921,7 +921,7 @@ bool ChatHandler::HandleAddSpwCommand(const char* args)
return true; return true;
} }
bool ChatHandler::HandleDelCreatureCommand(const char* args) bool ChatHandler::HandleNpcDeleteCommand(const char* args)
{ {
Creature* unit = NULL; Creature* unit = NULL;
@ -1069,7 +1069,7 @@ bool ChatHandler::HandleTurnObjectCommand(const char* args)
} }
//move selected creature //move selected creature
bool ChatHandler::HandleMoveCreatureCommand(const char* args) bool ChatHandler::HandleNpcMoveCommand(const char* args)
{ {
uint32 lowguid = 0; uint32 lowguid = 0;
@ -1321,7 +1321,7 @@ bool ChatHandler::HandleDelVendorItemCommand(const char* args)
} }
//add move for creature //add move for creature
bool ChatHandler::HandleAddMoveCommand(const char* args) bool ChatHandler::HandleNpcAddMoveCommand(const char* args)
{ {
if(!*args) if(!*args)
return false; return false;
@ -1395,7 +1395,7 @@ bool ChatHandler::HandleAddMoveCommand(const char* args)
* additional parameter: NODEL - so no waypoints are deleted, if you * additional parameter: NODEL - so no waypoints are deleted, if you
* change the movement type * change the movement type
*/ */
bool ChatHandler::HandleSetMoveTypeCommand(const char* args) bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
{ {
if(!*args) if(!*args)
return false; return false;
@ -1523,7 +1523,7 @@ bool ChatHandler::HandleSetMoveTypeCommand(const char* args)
} }
return true; return true;
} // HandleSetMoveTypeCommand } // HandleNpcSetMoveTypeCommand
//change level of creature or pet //change level of creature or pet
bool ChatHandler::HandleChangeLevelCommand(const char* args) bool ChatHandler::HandleChangeLevelCommand(const char* args)
@ -1563,7 +1563,7 @@ bool ChatHandler::HandleChangeLevelCommand(const char* args)
} }
//set npcflag of creature //set npcflag of creature
bool ChatHandler::HandleNPCFlagCommand(const char* args) bool ChatHandler::HandleNpcFlagCommand(const char* args)
{ {
if (!*args) if (!*args)
return false; return false;
@ -1589,7 +1589,7 @@ bool ChatHandler::HandleNPCFlagCommand(const char* args)
} }
//set model of creature //set model of creature
bool ChatHandler::HandleSetModelCommand(const char* args) bool ChatHandler::HandleNpcSetModelCommand(const char* args)
{ {
if (!*args) if (!*args)
return false; return false;
@ -1630,8 +1630,8 @@ bool ChatHandler::HandleMorphCommand(const char* args)
return true; return true;
} }
//set faction of creature or go //set faction of creature
bool ChatHandler::HandleFactionIdCommand(const char* args) bool ChatHandler::HandleNpcFactionIdCommand(const char* args)
{ {
if (!*args) if (!*args)
return false; return false;
@ -2120,7 +2120,7 @@ bool ChatHandler::HandleDelTicketCommand(const char *args)
} }
//set spawn dist of creature //set spawn dist of creature
bool ChatHandler::HandleSpawnDistCommand(const char* args) bool ChatHandler::HandleNpcSpawnDistCommand(const char* args)
{ {
if(!*args) if(!*args)
return false; return false;
@ -2158,7 +2158,7 @@ bool ChatHandler::HandleSpawnDistCommand(const char* args)
return true; return true;
} }
bool ChatHandler::HandleSpawnTimeCommand(const char* args) bool ChatHandler::HandleNpcSpawnTimeCommand(const char* args)
{ {
if(!*args) if(!*args)
return false; return false;

View file

@ -3600,7 +3600,7 @@ bool ChatHandler::HandleNearGraveCommand(const char* args)
} }
//play npc emote //play npc emote
bool ChatHandler::HandlePlayEmoteCommand(const char* args) bool ChatHandler::HandleNpcPlayEmoteCommand(const char* args)
{ {
uint32 emote = atoi((char*)args); uint32 emote = atoi((char*)args);
@ -5485,7 +5485,7 @@ bool ChatHandler::HandleLoadPDumpCommand(const char *args)
return true; return true;
} }
bool ChatHandler::HandleChangeEntryCommand(const char *args) bool ChatHandler::HandleNpcChangeEntryCommand(const char *args)
{ {
if(!args) if(!args)
return false; return false;