From 83f034ae5dcb21ebd78255cc2c140e67fab8d95f Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Thu, 30 Oct 2008 05:03:57 +0300 Subject: [PATCH] Some command handlers renames and declaration sorting. --- src/game/Chat.cpp | 32 ++++++++--------- src/game/Chat.h | 86 ++++++++++++++++++++++----------------------- src/game/Level1.cpp | 6 ++-- src/game/Level2.cpp | 24 ++++++------- src/game/Level3.cpp | 4 +-- 5 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index b12bd3e0c..2bceb2d0d 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -357,28 +357,28 @@ ChatCommand * ChatHandler::getCommandTable() static ChatCommand npcCommandTable[] = { - { "say", SEC_MODERATOR, false, &ChatHandler::HandleSayCommand, "", NULL }, - { "whisper", SEC_MODERATOR, false, &ChatHandler::HandleNpcWhisperCommand, "", NULL }, - { "yell", SEC_MODERATOR, false, &ChatHandler::HandleYellCommand, "", NULL }, - { "textemote", SEC_MODERATOR, false, &ChatHandler::HandleTextEmoteCommand, "", NULL }, - { "add", SEC_GAMEMASTER, false, &ChatHandler::HandleAddSpwCommand, "", NULL }, - { "delete", SEC_GAMEMASTER, false, &ChatHandler::HandleDelCreatureCommand, "", NULL }, - { "spawndist", SEC_GAMEMASTER, false, &ChatHandler::HandleSpawnDistCommand, "", NULL }, - { "spawntime", SEC_GAMEMASTER, false, &ChatHandler::HandleSpawnTimeCommand, "", NULL }, - { "factionid", SEC_GAMEMASTER, false, &ChatHandler::HandleFactionIdCommand, "", NULL }, - { "addmove", SEC_GAMEMASTER, false, &ChatHandler::HandleAddMoveCommand, "", NULL }, - { "setmovetype", SEC_GAMEMASTER, false, &ChatHandler::HandleSetMoveTypeCommand, "", NULL }, - { "move", SEC_GAMEMASTER, false, &ChatHandler::HandleMoveCreatureCommand, "", NULL }, + { "say", SEC_MODERATOR, false, &ChatHandler::HandleNpcSayCommand, "", NULL }, + { "textemote", SEC_MODERATOR, false, &ChatHandler::HandleNpcTextEmoteCommand, "", NULL }, + { "add", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcAddCommand, "", NULL }, + { "delete", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcDeleteCommand, "", NULL }, + { "spawndist", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcSpawnDistCommand, "", NULL }, + { "spawntime", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcSpawnTimeCommand, "", NULL }, + { "factionid", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcFactionIdCommand, "", NULL }, + { "addmove", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcAddMoveCommand, "", NULL }, + { "setmovetype", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcSetMoveTypeCommand, "", NULL }, + { "move", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcMoveCommand, "", 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 }, { "delitem", SEC_GAMEMASTER, false, &ChatHandler::HandleDelVendorItemCommand, "", NULL }, - { "flag", SEC_GAMEMASTER, false, &ChatHandler::HandleNPCFlagCommand, "", NULL }, - { "changeentry", SEC_ADMINISTRATOR, false, &ChatHandler::HandleChangeEntryCommand, "", NULL }, + { "flag", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcFlagCommand, "", NULL }, + { "changeentry", SEC_ADMINISTRATOR, false, &ChatHandler::HandleNpcChangeEntryCommand, "", 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 }, { "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 { "name", SEC_GAMEMASTER, false, &ChatHandler::HandleNameCommand, "", NULL }, diff --git a/src/game/Chat.h b/src/game/Chat.h index a5ded3c6c..4ddf2d92f 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -114,10 +114,6 @@ class ChatHandler bool HandleGPSCommand(const char* args); bool HandleTaxiCheatCommand(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 HandleNameTeleCommand(const char* args); bool HandleGroupTeleCommand(const char* args); @@ -128,6 +124,32 @@ class ChatHandler bool HandleEventStopCommand(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 HandleModifyHPCommand(const char* args); bool HandleModifyManaCommand(const char* args); @@ -149,8 +171,25 @@ class ChatHandler bool HandleModifyRepCommand(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 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 HandleNpcWhisperCommand(const char* args); + bool HandleNpcYellCommand(const char* args); bool HandleReloadCommand(const char* args); bool HandleReloadAllCommand(const char* args); @@ -245,28 +284,18 @@ class ChatHandler bool HandleNameCommand(const char* args); bool HandleSubNameCommand(const char* args); bool HandleItemMoveCommand(const char* args); - bool HandleDelCreatureCommand(const char* args); bool HandleDeMorphCommand(const char* args); bool HandleAddVendorItemCommand(const char* args); bool HandleDelVendorItemCommand(const char* args); - bool HandleAddMoveCommand(const char* args); - bool HandleSetMoveTypeCommand(const char* args); bool HandleChangeLevelCommand(const char* args); bool HandleSetPoiCommand(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 HandleGoObjectCommand(const char* args); bool HandleGoTriggerCommand(const char* args); bool HandleGoGraveyardCommand(const char* args); bool HandleTargetObjectCommand(const char* args); bool HandleDelObjectCommand(const char* args); - bool HandleMoveCreatureCommand(const char* args); bool HandleMoveObjectCommand(const char* args); bool HandleTurnObjectCommand(const char* args); bool HandlePInfoCommand(const char* args); @@ -300,32 +329,6 @@ class ChatHandler bool HandleAllowMovementCommand(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 HandleUnLearnCommand(const char* args); bool HandleGetDistanceCommand(const char* args); @@ -342,8 +345,6 @@ class ChatHandler bool HandleLinkGraveCommand(const char* args); bool HandleNearGraveCommand(const char* args); bool HandleExploreCheatCommand(const char* args); - bool HandleTextEmoteCommand(const char* args); - bool HandleNpcInfoCommand(const char* args); bool HandleHoverCommand(const char* args); bool HandleLevelUpCommand(const char* args); bool HandleShowAreaCommand(const char* args); @@ -400,7 +401,6 @@ class ChatHandler bool HandleRenameCommand(const char * args); bool HandleLoadPDumpCommand(const char *args); bool HandleWritePDumpCommand(const char *args); - bool HandleChangeEntryCommand(const char *args); bool HandleCastCommand(const char *args); bool HandleCastBackCommand(const char *args); bool HandleCastDistCommand(const char *args); diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 56e805f5b..f5e4234b5 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -36,7 +36,7 @@ #include "VMapFactory.h" #endif -bool ChatHandler::HandleSayCommand(const char* args) +bool ChatHandler::HandleNpcSayCommand(const char* args) { if(!*args) return false; @@ -54,7 +54,7 @@ bool ChatHandler::HandleSayCommand(const char* args) return true; } -bool ChatHandler::HandleYellCommand(const char* args) +bool ChatHandler::HandleNpcYellCommand(const char* args) { if(!*args) return false; @@ -73,7 +73,7 @@ bool ChatHandler::HandleYellCommand(const char* args) } //show text emote by creature in chat -bool ChatHandler::HandleTextEmoteCommand(const char* args) +bool ChatHandler::HandleNpcTextEmoteCommand(const char* args) { if(!*args) return false; diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 2d9043bc4..bb47d5fc7 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -871,7 +871,7 @@ bool ChatHandler::HandleItemMoveCommand(const char* args) } //add spawn of creature -bool ChatHandler::HandleAddSpwCommand(const char* args) +bool ChatHandler::HandleNpcAddCommand(const char* args) { if(!*args) return false; @@ -921,7 +921,7 @@ bool ChatHandler::HandleAddSpwCommand(const char* args) return true; } -bool ChatHandler::HandleDelCreatureCommand(const char* args) +bool ChatHandler::HandleNpcDeleteCommand(const char* args) { Creature* unit = NULL; @@ -1069,7 +1069,7 @@ bool ChatHandler::HandleTurnObjectCommand(const char* args) } //move selected creature -bool ChatHandler::HandleMoveCreatureCommand(const char* args) +bool ChatHandler::HandleNpcMoveCommand(const char* args) { uint32 lowguid = 0; @@ -1321,7 +1321,7 @@ bool ChatHandler::HandleDelVendorItemCommand(const char* args) } //add move for creature -bool ChatHandler::HandleAddMoveCommand(const char* args) +bool ChatHandler::HandleNpcAddMoveCommand(const char* args) { if(!*args) return false; @@ -1395,7 +1395,7 @@ bool ChatHandler::HandleAddMoveCommand(const char* args) * additional parameter: NODEL - so no waypoints are deleted, if you * change the movement type */ -bool ChatHandler::HandleSetMoveTypeCommand(const char* args) +bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) { if(!*args) return false; @@ -1523,7 +1523,7 @@ bool ChatHandler::HandleSetMoveTypeCommand(const char* args) } return true; -} // HandleSetMoveTypeCommand +} // HandleNpcSetMoveTypeCommand //change level of creature or pet bool ChatHandler::HandleChangeLevelCommand(const char* args) @@ -1563,7 +1563,7 @@ bool ChatHandler::HandleChangeLevelCommand(const char* args) } //set npcflag of creature -bool ChatHandler::HandleNPCFlagCommand(const char* args) +bool ChatHandler::HandleNpcFlagCommand(const char* args) { if (!*args) return false; @@ -1589,7 +1589,7 @@ bool ChatHandler::HandleNPCFlagCommand(const char* args) } //set model of creature -bool ChatHandler::HandleSetModelCommand(const char* args) +bool ChatHandler::HandleNpcSetModelCommand(const char* args) { if (!*args) return false; @@ -1630,8 +1630,8 @@ bool ChatHandler::HandleMorphCommand(const char* args) return true; } -//set faction of creature or go -bool ChatHandler::HandleFactionIdCommand(const char* args) +//set faction of creature +bool ChatHandler::HandleNpcFactionIdCommand(const char* args) { if (!*args) return false; @@ -2120,7 +2120,7 @@ bool ChatHandler::HandleDelTicketCommand(const char *args) } //set spawn dist of creature -bool ChatHandler::HandleSpawnDistCommand(const char* args) +bool ChatHandler::HandleNpcSpawnDistCommand(const char* args) { if(!*args) return false; @@ -2158,7 +2158,7 @@ bool ChatHandler::HandleSpawnDistCommand(const char* args) return true; } -bool ChatHandler::HandleSpawnTimeCommand(const char* args) +bool ChatHandler::HandleNpcSpawnTimeCommand(const char* args) { if(!*args) return false; diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 2129c41b1..87f092a60 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -3600,7 +3600,7 @@ bool ChatHandler::HandleNearGraveCommand(const char* args) } //play npc emote -bool ChatHandler::HandlePlayEmoteCommand(const char* args) +bool ChatHandler::HandleNpcPlayEmoteCommand(const char* args) { uint32 emote = atoi((char*)args); @@ -5485,7 +5485,7 @@ bool ChatHandler::HandleLoadPDumpCommand(const char *args) return true; } -bool ChatHandler::HandleChangeEntryCommand(const char *args) +bool ChatHandler::HandleNpcChangeEntryCommand(const char *args) { if(!args) return false;