diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index ecf1f77b6..5923969b4 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -192,7 +192,7 @@ ChatCommand * ChatHandler::getCommandTable() { "setitemvalue", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDebugSetItemValueCommand, "", NULL }, { "setvalue", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDebugSetValueCommand, "", NULL }, { "spellcheck", SEC_CONSOLE, true, &ChatHandler::HandleDebugSpellCheckCommand, "", NULL }, - { "spawnvehicle", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDebugSpawnVehicle, "", NULL }, + { "spawnvehicle", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDebugSpawnVehicleCommand, "", NULL }, { "uws", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDebugUpdateWorldStateCommand, "", NULL }, { "update", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDebugUpdateCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } @@ -411,9 +411,9 @@ ChatCommand * ChatHandler::getCommandTable() static ChatCommand questCommandTable[] = { - { "add", SEC_ADMINISTRATOR, false, &ChatHandler::HandleQuestAdd, "", NULL }, - { "complete", SEC_ADMINISTRATOR, false, &ChatHandler::HandleQuestComplete, "", NULL }, - { "remove", SEC_ADMINISTRATOR, false, &ChatHandler::HandleQuestRemove, "", NULL }, + { "add", SEC_ADMINISTRATOR, false, &ChatHandler::HandleQuestAddCommand, "", NULL }, + { "complete", SEC_ADMINISTRATOR, false, &ChatHandler::HandleQuestCompleteCommand, "", NULL }, + { "remove", SEC_ADMINISTRATOR, false, &ChatHandler::HandleQuestRemoveCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; @@ -706,7 +706,7 @@ ChatCommand * ChatHandler::getCommandTable() { "additem", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAddItemCommand, "", NULL }, { "additemset", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAddItemSetCommand, "", NULL }, { "bank", SEC_ADMINISTRATOR, false, &ChatHandler::HandleBankCommand, "", NULL }, - { "wchange", SEC_ADMINISTRATOR, false, &ChatHandler::HandleChangeWeather, "", NULL }, + { "wchange", SEC_ADMINISTRATOR, false, &ChatHandler::HandleChangeWeatherCommand, "", NULL }, { "ticket", SEC_GAMEMASTER, true, &ChatHandler::HandleTicketCommand, "", NULL }, { "delticket", SEC_GAMEMASTER, true, &ChatHandler::HandleDelTicketCommand, "", NULL }, { "maxskill", SEC_ADMINISTRATOR, false, &ChatHandler::HandleMaxSkillCommand, "", NULL }, @@ -1110,7 +1110,7 @@ void ChatHandler::ExecuteCommand(const char* text) case CHAT_COMMAND_OK: { SetSentErrorMessage(false); - if ((this->*(command->Handler))(text)) + if ((this->*(command->Handler))((char*)text)) // text content destroyed at call { if (command->SecurityLevel > SEC_PLAYER) { diff --git a/src/game/Chat.h b/src/game/Chat.h index 8eecbb204..7541d1dd4 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -38,7 +38,7 @@ class ChatCommand const char * Name; uint32 SecurityLevel; // function pointer required correct align (use uint32) bool AllowConsole; - bool (ChatHandler::*Handler)(const char* args); + bool (ChatHandler::*Handler)(char* args); std::string Help; ChatCommand * ChildCommands; }; @@ -112,440 +112,440 @@ class ChatHandler void CheckIntegrity(ChatCommand *table, ChatCommand *parentCommand); ChatCommand* getCommandTable(); - bool HandleAccountCommand(const char* args); - bool HandleAccountCharactersCommand(const char* args); - bool HandleAccountCreateCommand(const char* args); - bool HandleAccountDeleteCommand(const char* args); - bool HandleAccountLockCommand(const char* args); - bool HandleAccountOnlineListCommand(const char* args); - bool HandleAccountPasswordCommand(const char* args); - bool HandleAccountSetAddonCommand(const char* args); - bool HandleAccountSetGmLevelCommand(const char* args); - bool HandleAccountSetPasswordCommand(const char* args); + bool HandleAccountCommand(char* args); + bool HandleAccountCharactersCommand(char* args); + bool HandleAccountCreateCommand(char* args); + bool HandleAccountDeleteCommand(char* args); + bool HandleAccountLockCommand(char* args); + bool HandleAccountOnlineListCommand(char* args); + bool HandleAccountPasswordCommand(char* args); + bool HandleAccountSetAddonCommand(char* args); + bool HandleAccountSetGmLevelCommand(char* args); + bool HandleAccountSetPasswordCommand(char* args); - bool HandleAuctionAllianceCommand(const char* args); - bool HandleAuctionGoblinCommand(const char* args); - bool HandleAuctionHordeCommand(const char* args); - bool HandleAuctionCommand(const char* args); + bool HandleAuctionAllianceCommand(char* args); + bool HandleAuctionGoblinCommand(char* args); + bool HandleAuctionHordeCommand(char* args); + bool HandleAuctionCommand(char* args); - bool HandleBanAccountCommand(const char* args); - bool HandleBanCharacterCommand(const char* args); - bool HandleBanIPCommand(const char* args); - bool HandleBanInfoAccountCommand(const char* args); - bool HandleBanInfoCharacterCommand(const char* args); - bool HandleBanInfoIPCommand(const char* args); - bool HandleBanListAccountCommand(const char* args); - bool HandleBanListCharacterCommand(const char* args); - bool HandleBanListIPCommand(const char* args); + bool HandleBanAccountCommand(char* args); + bool HandleBanCharacterCommand(char* args); + bool HandleBanIPCommand(char* args); + bool HandleBanInfoAccountCommand(char* args); + bool HandleBanInfoCharacterCommand(char* args); + bool HandleBanInfoIPCommand(char* args); + bool HandleBanListAccountCommand(char* args); + bool HandleBanListCharacterCommand(char* args); + bool HandleBanListIPCommand(char* args); - bool HandleCastCommand(const char *args); - bool HandleCastBackCommand(const char *args); - bool HandleCastDistCommand(const char *args); - bool HandleCastSelfCommand(const char *args); - bool HandleCastTargetCommand(const char *args); + bool HandleCastCommand(char* args); + bool HandleCastBackCommand(char* args); + bool HandleCastDistCommand(char* args); + bool HandleCastSelfCommand(char* args); + bool HandleCastTargetCommand(char* args); - bool HandleCharacterCustomizeCommand(const char * args); - bool HandleCharacterDeletedDeleteCommand(const char* args); - bool HandleCharacterDeletedListCommand(const char* args); - bool HandleCharacterDeletedRestoreCommand(const char* args); - bool HandleCharacterDeletedOldCommand(const char* args); - bool HandleCharacterEraseCommand(const char* args); - bool HandleCharacterLevelCommand(const char* args); - bool HandleCharacterRenameCommand(const char * args); - bool HandleCharacterReputationCommand(const char* args); - bool HandleCharacterTitlesCommand(const char* args); + bool HandleCharacterCustomizeCommand(char* args); + bool HandleCharacterDeletedDeleteCommand(char* args); + bool HandleCharacterDeletedListCommand(char* args); + bool HandleCharacterDeletedRestoreCommand(char* args); + bool HandleCharacterDeletedOldCommand(char* args); + bool HandleCharacterEraseCommand(char* args); + bool HandleCharacterLevelCommand(char* args); + bool HandleCharacterRenameCommand(char* args); + bool HandleCharacterReputationCommand(char* args); + bool HandleCharacterTitlesCommand(char* args); - bool HandleDebugAnimCommand(const char* args); - bool HandleDebugArenaCommand(const char * args); - bool HandleDebugBattlegroundCommand(const char * args); - bool HandleDebugGetItemStateCommand(const char * args); - bool HandleDebugGetLootRecipientCommand(const char * args); - bool HandleDebugGetValueCommand(const char* args); - bool HandleDebugGetItemValueCommand(const char* args); - bool HandleDebugMod32ValueCommand(const char* args); - bool HandleDebugSetAuraStateCommand(const char * args); - bool HandleDebugSetItemValueCommand(const char * args); - bool HandleDebugSetValueCommand(const char* args); - bool HandleDebugSpawnVehicle(const char * args); - bool HandleDebugSpellCheckCommand(const char* args); - bool HandleDebugUpdateCommand(const char* args); - bool HandleDebugUpdateWorldStateCommand(const char* args); + bool HandleDebugAnimCommand(char* args); + bool HandleDebugArenaCommand(char* args); + bool HandleDebugBattlegroundCommand(char* args); + bool HandleDebugGetItemStateCommand(char* args); + bool HandleDebugGetLootRecipientCommand(char* args); + bool HandleDebugGetValueCommand(char* args); + bool HandleDebugGetItemValueCommand(char* args); + bool HandleDebugMod32ValueCommand(char* args); + bool HandleDebugSetAuraStateCommand(char* args); + bool HandleDebugSetItemValueCommand(char* args); + bool HandleDebugSetValueCommand(char* args); + bool HandleDebugSpawnVehicleCommand(char* args); + bool HandleDebugSpellCheckCommand(char* args); + bool HandleDebugUpdateCommand(char* args); + bool HandleDebugUpdateWorldStateCommand(char* args); - bool HandleDebugPlayCinematicCommand(const char* args); - bool HandleDebugPlayMovieCommand(const char* args); - bool HandleDebugPlaySoundCommand(const char* args); + bool HandleDebugPlayCinematicCommand(char* args); + bool HandleDebugPlayMovieCommand(char* args); + bool HandleDebugPlaySoundCommand(char* args); - bool HandleDebugSendBuyErrorCommand(const char* args); - bool HandleDebugSendChannelNotifyCommand(const char* args); - bool HandleDebugSendChatMsgCommand(const char* args); - bool HandleDebugSendEquipErrorCommand(const char* args); - bool HandleDebugSendLargePacketCommand(const char * args); - bool HandleDebugSendOpcodeCommand(const char* args); - bool HandleDebugSendPoiCommand(const char* args); - bool HandleDebugSendQuestPartyMsgCommand(const char* args); - bool HandleDebugSendQuestInvalidMsgCommand(const char* args); - bool HandleDebugSendSellErrorCommand(const char* args); - bool HandleDebugSendSetPhaseShiftCommand(const char * args); - bool HandleDebugSendSpellFailCommand(const char* args); + bool HandleDebugSendBuyErrorCommand(char* args); + bool HandleDebugSendChannelNotifyCommand(char* args); + bool HandleDebugSendChatMsgCommand(char* args); + bool HandleDebugSendEquipErrorCommand(char* args); + bool HandleDebugSendLargePacketCommand(char* args); + bool HandleDebugSendOpcodeCommand(char* args); + bool HandleDebugSendPoiCommand(char* args); + bool HandleDebugSendQuestPartyMsgCommand(char* args); + bool HandleDebugSendQuestInvalidMsgCommand(char* args); + bool HandleDebugSendSellErrorCommand(char* args); + bool HandleDebugSendSetPhaseShiftCommand(char* args); + bool HandleDebugSendSpellFailCommand(char* args); - bool HandleEventListCommand(const char* args); - bool HandleEventStartCommand(const char* args); - bool HandleEventStopCommand(const char* args); - bool HandleEventInfoCommand(const char* args); + bool HandleEventListCommand(char* args); + bool HandleEventStartCommand(char* args); + bool HandleEventStopCommand(char* args); + bool HandleEventInfoCommand(char* args); - bool HandleGameObjectAddCommand(const char* args); - bool HandleGameObjectDeleteCommand(const char* args); - bool HandleGameObjectMoveCommand(const char* args); - bool HandleGameObjectNearCommand(const char* args); - bool HandleGameObjectPhaseCommand(const char* args); - bool HandleGameObjectTargetCommand(const char* args); - bool HandleGameObjectTurnCommand(const char* args); + bool HandleGameObjectAddCommand(char* args); + bool HandleGameObjectDeleteCommand(char* args); + bool HandleGameObjectMoveCommand(char* args); + bool HandleGameObjectNearCommand(char* args); + bool HandleGameObjectPhaseCommand(char* args); + bool HandleGameObjectTargetCommand(char* args); + bool HandleGameObjectTurnCommand(char* args); - bool HandleGMCommand(const char* args); - bool HandleGMChatCommand(const char* args); - bool HandleGMFlyCommand(const char* args); - bool HandleGMListFullCommand(const char* args); - bool HandleGMListIngameCommand(const char* args); - bool HandleGMVisibleCommand(const char* args); + bool HandleGMCommand(char* args); + bool HandleGMChatCommand(char* args); + bool HandleGMFlyCommand(char* args); + bool HandleGMListFullCommand(char* args); + bool HandleGMListIngameCommand(char* args); + bool HandleGMVisibleCommand(char* args); - bool HandleGoCommand(const char* args); - bool HandleGoCreatureCommand(const char* args); - bool HandleGoGraveyardCommand(const char* args); - bool HandleGoGridCommand(const char* args); - bool HandleGoObjectCommand(const char* args); - bool HandleGoTaxinodeCommand(const char* args); - bool HandleGoTriggerCommand(const char* args); - bool HandleGoXYCommand(const char* args); - bool HandleGoXYZCommand(const char* args); - bool HandleGoZoneXYCommand(const char* args); + bool HandleGoCommand(char* args); + bool HandleGoCreatureCommand(char* args); + bool HandleGoGraveyardCommand(char* args); + bool HandleGoGridCommand(char* args); + bool HandleGoObjectCommand(char* args); + bool HandleGoTaxinodeCommand(char* args); + bool HandleGoTriggerCommand(char* args); + bool HandleGoXYCommand(char* args); + bool HandleGoXYZCommand(char* args); + bool HandleGoZoneXYCommand(char* args); - bool HandleGuildCreateCommand(const char* args); - bool HandleGuildInviteCommand(const char* args); - bool HandleGuildUninviteCommand(const char* args); - bool HandleGuildRankCommand(const char* args); - bool HandleGuildDeleteCommand(const char* args); + bool HandleGuildCreateCommand(char* args); + bool HandleGuildInviteCommand(char* args); + bool HandleGuildUninviteCommand(char* args); + bool HandleGuildRankCommand(char* args); + bool HandleGuildDeleteCommand(char* args); - bool HandleHonorAddCommand(const char* args); - bool HandleHonorAddKillCommand(const char* args); - bool HandleHonorUpdateCommand(const char* args); + bool HandleHonorAddCommand(char* args); + bool HandleHonorAddKillCommand(char* args); + bool HandleHonorUpdateCommand(char* args); - bool HandleInstanceListBindsCommand(const char* args); - bool HandleInstanceUnbindCommand(const char* args); - bool HandleInstanceStatsCommand(const char* args); - bool HandleInstanceSaveDataCommand(const char * args); + bool HandleInstanceListBindsCommand(char* args); + bool HandleInstanceUnbindCommand(char* args); + bool HandleInstanceStatsCommand(char* args); + bool HandleInstanceSaveDataCommand(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 HandleLearnAllMyPetTalentsCommand(const char* args); - bool HandleLearnAllMySpellsCommand(const char* args); - bool HandleLearnAllMyTalentsCommand(const char* args); + bool HandleLearnCommand(char* args); + bool HandleLearnAllCommand(char* args); + bool HandleLearnAllGMCommand(char* args); + bool HandleLearnAllCraftsCommand(char* args); + bool HandleLearnAllRecipesCommand(char* args); + bool HandleLearnAllDefaultCommand(char* args); + bool HandleLearnAllLangCommand(char* args); + bool HandleLearnAllMyClassCommand(char* args); + bool HandleLearnAllMyPetTalentsCommand(char* args); + bool HandleLearnAllMySpellsCommand(char* args); + bool HandleLearnAllMyTalentsCommand(char* args); - bool HandleListAurasCommand(const char * args); - bool HandleListCreatureCommand(const char* args); - bool HandleListItemCommand(const char* args); - bool HandleListObjectCommand(const char* args); - bool HandleListTalentsCommand(const char * args); + bool HandleListAurasCommand(char* args); + bool HandleListCreatureCommand(char* args); + bool HandleListItemCommand(char* args); + bool HandleListObjectCommand(char* args); + bool HandleListTalentsCommand(char* args); - bool HandleLookupAccountEmailCommand(const char* args); - bool HandleLookupAccountIpCommand(const char* args); - bool HandleLookupAccountNameCommand(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 HandleLookupTaxiNodeCommand(const char * args); - bool HandleLookupTeleCommand(const char * args); - bool HandleLookupTitleCommand(const char * args); + bool HandleLookupAccountEmailCommand(char* args); + bool HandleLookupAccountIpCommand(char* args); + bool HandleLookupAccountNameCommand(char* args); + bool HandleLookupAreaCommand(char* args); + bool HandleLookupCreatureCommand(char* args); + bool HandleLookupEventCommand(char* args); + bool HandleLookupFactionCommand(char* args); + bool HandleLookupItemCommand(char* args); + bool HandleLookupItemSetCommand(char* args); + bool HandleLookupObjectCommand(char* args); + bool HandleLookupPlayerIpCommand(char* args); + bool HandleLookupPlayerAccountCommand(char* args); + bool HandleLookupPlayerEmailCommand(char* args); + bool HandleLookupQuestCommand(char* args); + bool HandleLookupSkillCommand(char* args); + bool HandleLookupSpellCommand(char* args); + bool HandleLookupTaxiNodeCommand(char* args); + bool HandleLookupTeleCommand(char* args); + bool HandleLookupTitleCommand(char* args); - bool HandleModifyHPCommand(const char* args); - bool HandleModifyManaCommand(const char* args); - bool HandleModifyRageCommand(const char* args); - bool HandleModifyRunicPowerCommand(const char* args); - bool HandleModifyEnergyCommand(const char* args); - bool HandleModifyMoneyCommand(const char* args); - bool HandleModifyASpeedCommand(const char* args); - bool HandleModifySpeedCommand(const char* args); - bool HandleModifyBWalkCommand(const char* args); - bool HandleModifyFlyCommand(const char* args); - bool HandleModifySwimCommand(const char* args); - bool HandleModifyScaleCommand(const char* args); - bool HandleModifyMountCommand(const char* args); - bool HandleModifyBitCommand(const char* args); - bool HandleModifyFactionCommand(const char* args); - bool HandleModifySpellCommand(const char* args); - bool HandleModifyTalentCommand (const char* args); - bool HandleModifyHonorCommand (const char* args); - bool HandleModifyRepCommand(const char* args); - bool HandleModifyArenaCommand(const char* args); - bool HandleModifyPhaseCommand(const char* args); - bool HandleModifyGenderCommand(const char* args); + bool HandleModifyHPCommand(char* args); + bool HandleModifyManaCommand(char* args); + bool HandleModifyRageCommand(char* args); + bool HandleModifyRunicPowerCommand(char* args); + bool HandleModifyEnergyCommand(char* args); + bool HandleModifyMoneyCommand(char* args); + bool HandleModifyASpeedCommand(char* args); + bool HandleModifySpeedCommand(char* args); + bool HandleModifyBWalkCommand(char* args); + bool HandleModifyFlyCommand(char* args); + bool HandleModifySwimCommand(char* args); + bool HandleModifyScaleCommand(char* args); + bool HandleModifyMountCommand(char* args); + bool HandleModifyBitCommand(char* args); + bool HandleModifyFactionCommand(char* args); + bool HandleModifySpellCommand(char* args); + bool HandleModifyTalentCommand(char* args); + bool HandleModifyHonorCommand(char* args); + bool HandleModifyRepCommand(char* args); + bool HandleModifyArenaCommand(char* args); + bool HandleModifyPhaseCommand(char* args); + bool HandleModifyGenderCommand(char* args); //-----------------------Npc Commands----------------------- - bool HandleNpcAddCommand(const char* args); - bool HandleNpcAddMoveCommand(const char* args); - bool HandleNpcAddVendorItemCommand(const char* args); - bool HandleNpcAllowMovementCommand(const char* args); - bool HandleNpcChangeEntryCommand(const char *args); - bool HandleNpcChangeLevelCommand(const char* args); - bool HandleNpcDeleteCommand(const char* args); - bool HandleNpcDelVendorItemCommand(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 HandleNpcSetDeathStateCommand(const char* args); - bool HandleNpcSetModelCommand(const char* args); - bool HandleNpcSetMoveTypeCommand(const char* args); - bool HandleNpcSetPhaseCommand(const char* args); - bool HandleNpcSpawnDistCommand(const char* args); - bool HandleNpcSpawnTimeCommand(const char* args); - bool HandleNpcTameCommand(const char* args); - bool HandleNpcTextEmoteCommand(const char* args); - bool HandleNpcUnFollowCommand(const char* args); - bool HandleNpcWhisperCommand(const char* args); - bool HandleNpcYellCommand(const char* args); + bool HandleNpcAddCommand(char* args); + bool HandleNpcAddMoveCommand(char* args); + bool HandleNpcAddVendorItemCommand(char* args); + bool HandleNpcAllowMovementCommand(char* args); + bool HandleNpcChangeEntryCommand(char* args); + bool HandleNpcChangeLevelCommand(char* args); + bool HandleNpcDeleteCommand(char* args); + bool HandleNpcDelVendorItemCommand(char* args); + bool HandleNpcFactionIdCommand(char* args); + bool HandleNpcFlagCommand(char* args); + bool HandleNpcFollowCommand(char* args); + bool HandleNpcInfoCommand(char* args); + bool HandleNpcMoveCommand(char* args); + bool HandleNpcPlayEmoteCommand(char* args); + bool HandleNpcSayCommand(char* args); + bool HandleNpcSetDeathStateCommand(char* args); + bool HandleNpcSetModelCommand(char* args); + bool HandleNpcSetMoveTypeCommand(char* args); + bool HandleNpcSetPhaseCommand(char* args); + bool HandleNpcSpawnDistCommand(char* args); + bool HandleNpcSpawnTimeCommand(char* args); + bool HandleNpcTameCommand(char* args); + bool HandleNpcTextEmoteCommand(char* args); + bool HandleNpcUnFollowCommand(char* args); + bool HandleNpcWhisperCommand(char* args); + bool HandleNpcYellCommand(char* args); //TODO: NpcCommands that needs to be fixed : - bool HandleNpcAddWeaponCommand(const char* args); - bool HandleNpcNameCommand(const char* args); - bool HandleNpcSubNameCommand(const char* args); + bool HandleNpcAddWeaponCommand(char* args); + bool HandleNpcNameCommand(char* args); + bool HandleNpcSubNameCommand(char* args); //---------------------------------------------------------- - bool HandlePDumpLoadCommand(const char *args); - bool HandlePDumpWriteCommand(const char *args); + bool HandlePDumpLoadCommand(char* args); + bool HandlePDumpWriteCommand(char* args); - bool HandleQuestAdd(const char * args); - bool HandleQuestRemove(const char * args); - bool HandleQuestComplete(const char * args); + bool HandleQuestAddCommand(char* args); + bool HandleQuestRemoveCommand(char* args); + bool HandleQuestCompleteCommand(char* args); - bool HandleReloadAllCommand(const char* args); - bool HandleReloadAllAchievementCommand(const char* args); - bool HandleReloadAllAreaCommand(const char* args); - bool HandleReloadAllGossipsCommand(const char* args); - bool HandleReloadAllItemCommand(const char* args); - bool HandleReloadAllLootCommand(const char* args); - bool HandleReloadAllNpcCommand(const char* args); - bool HandleReloadAllQuestCommand(const char* args); - bool HandleReloadAllScriptsCommand(const char* args); - bool HandleReloadAllEventAICommand(const char* args); - bool HandleReloadAllSpellCommand(const char* args); - bool HandleReloadAllLocalesCommand(const char* args); + bool HandleReloadAllCommand(char* args); + bool HandleReloadAllAchievementCommand(char* args); + bool HandleReloadAllAreaCommand(char* args); + bool HandleReloadAllGossipsCommand(char* args); + bool HandleReloadAllItemCommand(char* args); + bool HandleReloadAllLootCommand(char* args); + bool HandleReloadAllNpcCommand(char* args); + bool HandleReloadAllQuestCommand(char* args); + bool HandleReloadAllScriptsCommand(char* args); + bool HandleReloadAllEventAICommand(char* args); + bool HandleReloadAllSpellCommand(char* args); + bool HandleReloadAllLocalesCommand(char* args); - bool HandleReloadConfigCommand(const char* args); + bool HandleReloadConfigCommand(char* args); - bool HandleReloadAchievementCriteriaRequirementCommand(const char* args); - bool HandleReloadAchievementRewardCommand(const char* args); - bool HandleReloadAreaTriggerTavernCommand(const char* args); - bool HandleReloadAreaTriggerTeleportCommand(const char* args); - bool HandleReloadEventScriptsCommand(const char* args); - bool HandleReloadEventAITextsCommand(const char* args); - bool HandleReloadEventAISummonsCommand(const char* args); - bool HandleReloadEventAIScriptsCommand(const char* args); - bool HandleReloadCommandCommand(const char* args); - bool HandleReloadBattleEventCommand(const char* args); - bool HandleReloadCreatureQuestRelationsCommand(const char* args); - bool HandleReloadCreatureQuestInvRelationsCommand(const char* args); - bool HandleReloadDbScriptStringCommand(const char* args); - bool HandleReloadGameGraveyardZoneCommand(const char* args); - bool HandleReloadGameObjectScriptsCommand(const char* args); - bool HandleReloadGameTeleCommand(const char* args); - bool HandleReloadGossipMenuCommand(const char* args); - bool HandleReloadGossipMenuOptionCommand(const char* args); - bool HandleReloadGossipScriptsCommand(const char* args); - bool HandleReloadGOQuestRelationsCommand(const char* args); - bool HandleReloadGOQuestInvRelationsCommand(const char* args); - bool HandleReloadItemEnchantementsCommand(const char* args); - bool HandleReloadItemRequiredTragetCommand(const char* args); - bool HandleReloadLocalesAchievementRewardCommand(const char* args); - bool HandleReloadLocalesCreatureCommand(const char* args); - bool HandleReloadLocalesGameobjectCommand(const char* args); - bool HandleReloadLocalesGossipMenuOptionCommand(const char* args); - bool HandleReloadLocalesItemCommand(const char* args); - bool HandleReloadLocalesNpcTextCommand(const char* args); - bool HandleReloadLocalesPageTextCommand(const char* args); - bool HandleReloadLocalesPointsOfInterestCommand(const char* args); - bool HandleReloadLocalesQuestCommand(const char* args); - bool HandleReloadLootTemplatesCreatureCommand(const char* args); - bool HandleReloadLootTemplatesDisenchantCommand(const char* args); - bool HandleReloadLootTemplatesFishingCommand(const char* args); - bool HandleReloadLootTemplatesGameobjectCommand(const char* args); - bool HandleReloadLootTemplatesItemCommand(const char* args); - bool HandleReloadLootTemplatesMailCommand(const char* args); - bool HandleReloadLootTemplatesMillingCommand(const char* args); - bool HandleReloadLootTemplatesPickpocketingCommand(const char* args); - bool HandleReloadLootTemplatesProspectingCommand(const char* args); - bool HandleReloadLootTemplatesReferenceCommand(const char* args); - bool HandleReloadLootTemplatesSkinningCommand(const char* args); - bool HandleReloadLootTemplatesSpellCommand(const char* args); - bool HandleReloadMailLevelRewardCommand(const char* args); - bool HandleReloadMangosStringCommand(const char* args); - bool HandleReloadNpcGossipCommand(const char* args); - bool HandleReloadNpcTrainerCommand(const char* args); - bool HandleReloadNpcVendorCommand(const char* args); - bool HandleReloadPageTextsCommand(const char* args); - bool HandleReloadPointsOfInterestCommand(const char* args); - bool HandleReloadSpellClickSpellsCommand(const char* args); - bool HandleReloadQuestAreaTriggersCommand(const char* args); - bool HandleReloadQuestEndScriptsCommand(const char* args); - bool HandleReloadQuestPOICommand(const char* args); - bool HandleReloadQuestStartScriptsCommand(const char* args); - bool HandleReloadQuestTemplateCommand(const char* args); - bool HandleReloadReservedNameCommand(const char*); - bool HandleReloadReputationRewardRateCommand(const char* args); - bool HandleReloadReputationSpilloverTemplateCommand(const char* args); - bool HandleReloadSkillDiscoveryTemplateCommand(const char* args); - bool HandleReloadSkillExtraItemTemplateCommand(const char* args); - bool HandleReloadSkillFishingBaseLevelCommand(const char* args); - bool HandleReloadSpellAreaCommand(const char* args); - bool HandleReloadSpellChainCommand(const char* args); - bool HandleReloadSpellElixirCommand(const char* args); - bool HandleReloadSpellLearnSpellCommand(const char* args); - bool HandleReloadSpellProcEventCommand(const char* args); - bool HandleReloadSpellProcItemEnchantCommand(const char* args); - bool HandleReloadSpellBonusesCommand(const char* args); - bool HandleReloadSpellScriptTargetCommand(const char* args); - bool HandleReloadSpellScriptsCommand(const char* args); - bool HandleReloadSpellTargetPositionCommand(const char* args); - bool HandleReloadSpellThreatsCommand(const char* args); - bool HandleReloadSpellPetAurasCommand(const char* args); + bool HandleReloadAchievementCriteriaRequirementCommand(char* args); + bool HandleReloadAchievementRewardCommand(char* args); + bool HandleReloadAreaTriggerTavernCommand(char* args); + bool HandleReloadAreaTriggerTeleportCommand(char* args); + bool HandleReloadEventScriptsCommand(char* args); + bool HandleReloadEventAITextsCommand(char* args); + bool HandleReloadEventAISummonsCommand(char* args); + bool HandleReloadEventAIScriptsCommand(char* args); + bool HandleReloadCommandCommand(char* args); + bool HandleReloadBattleEventCommand(char* args); + bool HandleReloadCreatureQuestRelationsCommand(char* args); + bool HandleReloadCreatureQuestInvRelationsCommand(char* args); + bool HandleReloadDbScriptStringCommand(char* args); + bool HandleReloadGameGraveyardZoneCommand(char* args); + bool HandleReloadGameObjectScriptsCommand(char* args); + bool HandleReloadGameTeleCommand(char* args); + bool HandleReloadGossipMenuCommand(char* args); + bool HandleReloadGossipMenuOptionCommand(char* args); + bool HandleReloadGossipScriptsCommand(char* args); + bool HandleReloadGOQuestRelationsCommand(char* args); + bool HandleReloadGOQuestInvRelationsCommand(char* args); + bool HandleReloadItemEnchantementsCommand(char* args); + bool HandleReloadItemRequiredTragetCommand(char* args); + bool HandleReloadLocalesAchievementRewardCommand(char* args); + bool HandleReloadLocalesCreatureCommand(char* args); + bool HandleReloadLocalesGameobjectCommand(char* args); + bool HandleReloadLocalesGossipMenuOptionCommand(char* args); + bool HandleReloadLocalesItemCommand(char* args); + bool HandleReloadLocalesNpcTextCommand(char* args); + bool HandleReloadLocalesPageTextCommand(char* args); + bool HandleReloadLocalesPointsOfInterestCommand(char* args); + bool HandleReloadLocalesQuestCommand(char* args); + bool HandleReloadLootTemplatesCreatureCommand(char* args); + bool HandleReloadLootTemplatesDisenchantCommand(char* args); + bool HandleReloadLootTemplatesFishingCommand(char* args); + bool HandleReloadLootTemplatesGameobjectCommand(char* args); + bool HandleReloadLootTemplatesItemCommand(char* args); + bool HandleReloadLootTemplatesMailCommand(char* args); + bool HandleReloadLootTemplatesMillingCommand(char* args); + bool HandleReloadLootTemplatesPickpocketingCommand(char* args); + bool HandleReloadLootTemplatesProspectingCommand(char* args); + bool HandleReloadLootTemplatesReferenceCommand(char* args); + bool HandleReloadLootTemplatesSkinningCommand(char* args); + bool HandleReloadLootTemplatesSpellCommand(char* args); + bool HandleReloadMailLevelRewardCommand(char* args); + bool HandleReloadMangosStringCommand(char* args); + bool HandleReloadNpcGossipCommand(char* args); + bool HandleReloadNpcTrainerCommand(char* args); + bool HandleReloadNpcVendorCommand(char* args); + bool HandleReloadPageTextsCommand(char* args); + bool HandleReloadPointsOfInterestCommand(char* args); + bool HandleReloadSpellClickSpellsCommand(char* args); + bool HandleReloadQuestAreaTriggersCommand(char* args); + bool HandleReloadQuestEndScriptsCommand(char* args); + bool HandleReloadQuestPOICommand(char* args); + bool HandleReloadQuestStartScriptsCommand(char* args); + bool HandleReloadQuestTemplateCommand(char* args); + bool HandleReloadReservedNameCommand(char* args); + bool HandleReloadReputationRewardRateCommand(char* args); + bool HandleReloadReputationSpilloverTemplateCommand(char* args); + bool HandleReloadSkillDiscoveryTemplateCommand(char* args); + bool HandleReloadSkillExtraItemTemplateCommand(char* args); + bool HandleReloadSkillFishingBaseLevelCommand(char* args); + bool HandleReloadSpellAreaCommand(char* args); + bool HandleReloadSpellChainCommand(char* args); + bool HandleReloadSpellElixirCommand(char* args); + bool HandleReloadSpellLearnSpellCommand(char* args); + bool HandleReloadSpellProcEventCommand(char* args); + bool HandleReloadSpellProcItemEnchantCommand(char* args); + bool HandleReloadSpellBonusesCommand(char* args); + bool HandleReloadSpellScriptTargetCommand(char* args); + bool HandleReloadSpellScriptsCommand(char* args); + bool HandleReloadSpellTargetPositionCommand(char* args); + bool HandleReloadSpellThreatsCommand(char* args); + bool HandleReloadSpellPetAurasCommand(char* args); - bool HandleResetAchievementsCommand(const char * args); - bool HandleResetAllCommand(const char * args); - bool HandleResetHonorCommand(const char * args); - bool HandleResetLevelCommand(const char * args); - bool HandleResetSpecsCommand(const char * args); - bool HandleResetSpellsCommand(const char * args); - bool HandleResetStatsCommand(const char * args); - bool HandleResetTalentsCommand(const char * args); + bool HandleResetAchievementsCommand(char* args); + bool HandleResetAllCommand(char* args); + bool HandleResetHonorCommand(char* args); + bool HandleResetLevelCommand(char* args); + bool HandleResetSpecsCommand(char* args); + bool HandleResetSpellsCommand(char* args); + bool HandleResetStatsCommand(char* args); + bool HandleResetTalentsCommand(char* args); - bool HandleSendItemsCommand(const char* args); - bool HandleSendMailCommand(const char* args); - bool HandleSendMessageCommand(const char * args); - bool HandleSendMoneyCommand(const char* args); + bool HandleSendItemsCommand(char* args); + bool HandleSendMailCommand(char* args); + bool HandleSendMessageCommand(char* args); + bool HandleSendMoneyCommand(char* args); - bool HandleServerCorpsesCommand(const char* args); - bool HandleServerExitCommand(const char* args); - bool HandleServerIdleRestartCommand(const char* args); - bool HandleServerIdleShutDownCommand(const char* args); - bool HandleServerInfoCommand(const char* args); - bool HandleServerLogFilterCommand(const char* args); - bool HandleServerLogLevelCommand(const char* args); - bool HandleServerMotdCommand(const char* args); - bool HandleServerPLimitCommand(const char* args); - bool HandleServerRestartCommand(const char* args); - bool HandleServerSetMotdCommand(const char* args); - bool HandleServerShutDownCommand(const char* args); - bool HandleServerShutDownCancelCommand(const char* args); + bool HandleServerCorpsesCommand(char* args); + bool HandleServerExitCommand(char* args); + bool HandleServerIdleRestartCommand(char* args); + bool HandleServerIdleShutDownCommand(char* args); + bool HandleServerInfoCommand(char* args); + bool HandleServerLogFilterCommand(char* args); + bool HandleServerLogLevelCommand(char* args); + bool HandleServerMotdCommand(char* args); + bool HandleServerPLimitCommand(char* args); + bool HandleServerRestartCommand(char* args); + bool HandleServerSetMotdCommand(char* args); + bool HandleServerShutDownCommand(char* args); + bool HandleServerShutDownCancelCommand(char* args); - bool HandleTeleCommand(const char * args); - bool HandleTeleAddCommand(const char * args); - bool HandleTeleDelCommand(const char * args); - bool HandleTeleGroupCommand(const char* args); - bool HandleTeleNameCommand(const char* args); + bool HandleTeleCommand(char* args); + bool HandleTeleAddCommand(char* args); + bool HandleTeleDelCommand(char* args); + bool HandleTeleGroupCommand(char* args); + bool HandleTeleNameCommand(char* args); - bool HandleTitlesAddCommand(const char* args); - bool HandleTitlesCurrentCommand(const char* args); - bool HandleTitlesRemoveCommand(const char* args); - bool HandleTitlesSetMaskCommand(const char* args); + bool HandleTitlesAddCommand(char* args); + bool HandleTitlesCurrentCommand(char* args); + bool HandleTitlesRemoveCommand(char* args); + bool HandleTitlesSetMaskCommand(char* args); - bool HandleTriggerActiveCommand(const char* args); - bool HandleTriggerNearCommand(const char* args); - bool HandleTriggerCommand(const char* args); + bool HandleTriggerActiveCommand(char* args); + bool HandleTriggerNearCommand(char* args); + bool HandleTriggerCommand(char* args); - bool HandleUnBanAccountCommand(const char* args); - bool HandleUnBanCharacterCommand(const char* args); - bool HandleUnBanIPCommand(const char* args); + bool HandleUnBanAccountCommand(char* args); + bool HandleUnBanCharacterCommand(char* args); + bool HandleUnBanIPCommand(char* args); - bool HandleWpAddCommand(const char* args); - bool HandleWpModifyCommand(const char* args); - bool HandleWpShowCommand(const char* args); - bool HandleWpExportCommand(const char* args); - bool HandleWpImportCommand(const char* args); + bool HandleWpAddCommand(char* args); + bool HandleWpModifyCommand(char* args); + bool HandleWpShowCommand(char* args); + bool HandleWpExportCommand(char* args); + bool HandleWpImportCommand(char* args); - bool HandleHelpCommand(const char* args); - bool HandleCommandsCommand(const char* args); - bool HandleStartCommand(const char* args); - bool HandleDismountCommand(const char* args); - bool HandleSaveCommand(const char* args); + bool HandleHelpCommand(char* args); + bool HandleCommandsCommand(char* args); + bool HandleStartCommand(char* args); + bool HandleDismountCommand(char* args); + bool HandleSaveCommand(char* args); - bool HandleNamegoCommand(const char* args); - bool HandleGonameCommand(const char* args); - bool HandleGroupgoCommand(const char* args); - bool HandleRecallCommand(const char* args); - bool HandleAnnounceCommand(const char* args); - bool HandleNotifyCommand(const char* args); - bool HandleGPSCommand(const char* args); - bool HandleTaxiCheatCommand(const char* args); - bool HandleWhispersCommand(const char* args); - bool HandleModifyDrunkCommand(const char* args); + bool HandleNamegoCommand(char* args); + bool HandleGonameCommand(char* args); + bool HandleGroupgoCommand(char* args); + bool HandleRecallCommand(char* args); + bool HandleAnnounceCommand(char* args); + bool HandleNotifyCommand(char* args); + bool HandleGPSCommand(char* args); + bool HandleTaxiCheatCommand(char* args); + bool HandleWhispersCommand(char* args); + bool HandleModifyDrunkCommand(char* args); - bool HandleLoadScriptsCommand(const char* args); + bool HandleLoadScriptsCommand(char* args); - bool HandleGUIDCommand(const char* args); - bool HandleItemMoveCommand(const char* args); - bool HandleDeMorphCommand(const char* args); - bool HandlePInfoCommand(const char* args); - bool HandleMuteCommand(const char* args); - bool HandleUnmuteCommand(const char* args); - bool HandleMovegensCommand(const char* args); + bool HandleGUIDCommand(char* args); + bool HandleItemMoveCommand(char* args); + bool HandleDeMorphCommand(char* args); + bool HandlePInfoCommand(char* args); + bool HandleMuteCommand(char* args); + bool HandleUnmuteCommand(char* args); + bool HandleMovegensCommand(char* args); - bool HandleCooldownCommand(const char* args); - bool HandleUnLearnCommand(const char* args); - bool HandleGetDistanceCommand(const char* args); - bool HandleModifyStandStateCommand(const char* args); - bool HandleDieCommand(const char* args); - bool HandleDamageCommand(const char *args); - bool HandleReviveCommand(const char* args); - bool HandleModifyMorphCommand(const char* args); - bool HandleAuraCommand(const char* args); - bool HandleUnAuraCommand(const char* args); - bool HandleLinkGraveCommand(const char* args); - bool HandleNearGraveCommand(const char* args); - bool HandleExploreCheatCommand(const char* args); - bool HandleHoverCommand(const char* args); - bool HandleLevelUpCommand(const char* args); - bool HandleShowAreaCommand(const char* args); - bool HandleHideAreaCommand(const char* args); - bool HandleAddItemCommand(const char* args); - bool HandleAddItemSetCommand(const char* args); + bool HandleCooldownCommand(char* args); + bool HandleUnLearnCommand(char* args); + bool HandleGetDistanceCommand(char* args); + bool HandleModifyStandStateCommand(char* args); + bool HandleDieCommand(char* args); + bool HandleDamageCommand(char* args); + bool HandleReviveCommand(char* args); + bool HandleModifyMorphCommand(char* args); + bool HandleAuraCommand(char* args); + bool HandleUnAuraCommand(char* args); + bool HandleLinkGraveCommand(char* args); + bool HandleNearGraveCommand(char* args); + bool HandleExploreCheatCommand(char* args); + bool HandleHoverCommand(char* args); + bool HandleLevelUpCommand(char* args); + bool HandleShowAreaCommand(char* args); + bool HandleHideAreaCommand(char* args); + bool HandleAddItemCommand(char* args); + bool HandleAddItemSetCommand(char* args); - bool HandleBankCommand(const char* args); - bool HandleChangeWeather(const char* args); - bool HandleKickPlayerCommand(const char * args); + bool HandleBankCommand(char* args); + bool HandleChangeWeatherCommand(char* args); + bool HandleKickPlayerCommand(char* args); - bool HandleTicketCommand(const char* args); - bool HandleDelTicketCommand(const char* args); - bool HandleMaxSkillCommand(const char* args); - bool HandleSetSkillCommand(const char* args); - bool HandleRespawnCommand(const char* args); - bool HandleComeToMeCommand(const char *args); - bool HandleCombatStopCommand(const char *args); - bool HandleFlushArenaPointsCommand(const char *args); - bool HandleRepairitemsCommand(const char* args); - bool HandleStableCommand(const char* args); - bool HandleWaterwalkCommand(const char* args); - bool HandleQuitCommand(const char* args); + bool HandleTicketCommand(char* args); + bool HandleDelTicketCommand(char* args); + bool HandleMaxSkillCommand(char* args); + bool HandleSetSkillCommand(char* args); + bool HandleRespawnCommand(char* args); + bool HandleComeToMeCommand(char* args); + bool HandleCombatStopCommand(char* args); + bool HandleFlushArenaPointsCommand(char* args); + bool HandleRepairitemsCommand(char* args); + bool HandleStableCommand(char* args); + bool HandleWaterwalkCommand(char* args); + bool HandleQuitCommand(char* args); //! Development Commands - bool HandleSaveAllCommand(const char* args); + bool HandleSaveAllCommand(char* args); Player* getSelectedPlayer(); Creature* getSelectedCreature(); @@ -585,9 +585,9 @@ class ChatHandler void ShowTriggerTargetListHelper(uint32 id, AreaTrigger const* at, bool subpart = false); bool LookupPlayerSearchCommand(QueryResult* result, uint32* limit = NULL); bool HandleBanListHelper(QueryResult* result); - bool HandleBanHelper(BanMode mode,char const* args); + bool HandleBanHelper(BanMode mode, char* args); bool HandleBanInfoHelper(uint32 accountid, char const* accountname); - bool HandleUnBanHelper(BanMode mode,char const* args); + bool HandleUnBanHelper(BanMode mode, char* args); void HandleCharacterLevel(Player* player, uint64 player_guid, uint32 oldlevel, uint32 newlevel); void HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id); bool HandleGoHelper(Player* _player, uint32 mapid, float x, float y, float const* zPtr = NULL, float const* ortPtr = NULL); diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index cb2404be1..4a03d306d 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -30,7 +30,7 @@ #include "revision_nr.h" #include "Util.h" -bool ChatHandler::HandleHelpCommand(const char* args) +bool ChatHandler::HandleHelpCommand(char* args) { if(!*args) { @@ -46,13 +46,13 @@ bool ChatHandler::HandleHelpCommand(const char* args) return true; } -bool ChatHandler::HandleCommandsCommand(const char* /*args*/) +bool ChatHandler::HandleCommandsCommand(char* /*args*/) { ShowHelpForCommand(getCommandTable(), ""); return true; } -bool ChatHandler::HandleAccountCommand(const char* args) +bool ChatHandler::HandleAccountCommand(char* args) { // let show subcommands at unexpected data in args if (*args) @@ -63,7 +63,7 @@ bool ChatHandler::HandleAccountCommand(const char* args) return true; } -bool ChatHandler::HandleStartCommand(const char* /*args*/) +bool ChatHandler::HandleStartCommand(char* /*args*/) { Player *chr = m_session->GetPlayer(); @@ -86,7 +86,7 @@ bool ChatHandler::HandleStartCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleServerInfoCommand(const char* /*args*/) +bool ChatHandler::HandleServerInfoCommand(char* /*args*/) { uint32 activeClientsNum = sWorld.GetActiveSessionCount(); uint32 queuedClientsNum = sWorld.GetQueuedSessionCount(); @@ -110,7 +110,7 @@ bool ChatHandler::HandleServerInfoCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleDismountCommand(const char* /*args*/) +bool ChatHandler::HandleDismountCommand(char* /*args*/) { //If player is not mounted, so go out :) if (!m_session->GetPlayer( )->IsMounted()) @@ -132,7 +132,7 @@ bool ChatHandler::HandleDismountCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleSaveCommand(const char* /*args*/) +bool ChatHandler::HandleSaveCommand(char* /*args*/) { Player *player=m_session->GetPlayer(); @@ -152,7 +152,7 @@ bool ChatHandler::HandleSaveCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/) +bool ChatHandler::HandleGMListIngameCommand(char* /*args*/) { std::list< std::pair > names; @@ -183,7 +183,7 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleAccountPasswordCommand(const char* args) +bool ChatHandler::HandleAccountPasswordCommand(char* args) { // allow use from RA, but not from console (not have associated account id) if (!GetAccountId()) @@ -196,7 +196,7 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args) if(!*args) return false; - char *old_pass = strtok ((char*)args, " "); + char *old_pass = strtok (args, " "); char *new_pass = strtok (NULL, " "); char *new_pass_c = strtok (NULL, " "); @@ -242,7 +242,7 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args) return true; } -bool ChatHandler::HandleAccountLockCommand(const char* args) +bool ChatHandler::HandleAccountLockCommand(char* args) { // allow use from RA, but not from console (not have associated account id) if (!GetAccountId()) @@ -258,7 +258,7 @@ bool ChatHandler::HandleAccountLockCommand(const char* args) return true; } - std::string argstr = (char*)args; + std::string argstr = args; if (argstr == "on") { LoginDatabase.PExecute( "UPDATE account SET locked = '1' WHERE id = '%d'",GetAccountId()); @@ -278,7 +278,7 @@ bool ChatHandler::HandleAccountLockCommand(const char* args) } /// Display the 'Message of the day' for the realm -bool ChatHandler::HandleServerMotdCommand(const char* /*args*/) +bool ChatHandler::HandleServerMotdCommand(char* /*args*/) { PSendSysMessage(LANG_MOTD_CURRENT, sWorld.GetMotd()); return true; diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 3a05e7b39..7bbcdf283 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -38,7 +38,7 @@ #endif //-----------------------Npc Commands----------------------- -bool ChatHandler::HandleNpcSayCommand(const char* args) +bool ChatHandler::HandleNpcSayCommand(char* args) { if(!*args) return false; @@ -56,7 +56,7 @@ bool ChatHandler::HandleNpcSayCommand(const char* args) return true; } -bool ChatHandler::HandleNpcYellCommand(const char* args) +bool ChatHandler::HandleNpcYellCommand(char* args) { if(!*args) return false; @@ -75,7 +75,7 @@ bool ChatHandler::HandleNpcYellCommand(const char* args) } //show text emote by creature in chat -bool ChatHandler::HandleNpcTextEmoteCommand(const char* args) +bool ChatHandler::HandleNpcTextEmoteCommand(char* args) { if(!*args) return false; @@ -95,12 +95,12 @@ bool ChatHandler::HandleNpcTextEmoteCommand(const char* args) } // make npc whisper to player -bool ChatHandler::HandleNpcWhisperCommand(const char* args) +bool ChatHandler::HandleNpcWhisperCommand(char* args) { if(!*args) return false; - char* receiver_str = strtok((char*)args, " "); + char* receiver_str = strtok(args, " "); char* text = strtok(NULL, ""); uint64 guid = m_session->GetPlayer()->GetSelection(); @@ -124,7 +124,7 @@ bool ChatHandler::HandleNpcWhisperCommand(const char* args) //---------------------------------------------------------- // global announce -bool ChatHandler::HandleAnnounceCommand(const char* args) +bool ChatHandler::HandleAnnounceCommand(char* args) { if(!*args) return false; @@ -134,7 +134,7 @@ bool ChatHandler::HandleAnnounceCommand(const char* args) } //notification player at the screen -bool ChatHandler::HandleNotifyCommand(const char* args) +bool ChatHandler::HandleNotifyCommand(char* args) { if(!*args) return false; @@ -150,7 +150,7 @@ bool ChatHandler::HandleNotifyCommand(const char* args) } //Enable\Dissable GM Mode -bool ChatHandler::HandleGMCommand(const char* args) +bool ChatHandler::HandleGMCommand(char* args) { if(!*args) { @@ -161,7 +161,7 @@ bool ChatHandler::HandleGMCommand(const char* args) return true; } - std::string argstr = (char*)args; + std::string argstr = args; if (argstr == "on") { @@ -191,7 +191,7 @@ bool ChatHandler::HandleGMCommand(const char* args) } // Enables or disables hiding of the staff badge -bool ChatHandler::HandleGMChatCommand(const char* args) +bool ChatHandler::HandleGMChatCommand(char* args) { if(!*args) { @@ -202,7 +202,7 @@ bool ChatHandler::HandleGMChatCommand(const char* args) return true; } - std::string argstr = (char*)args; + std::string argstr = args; if (argstr == "on") { @@ -224,7 +224,7 @@ bool ChatHandler::HandleGMChatCommand(const char* args) } //Enable\Dissable Invisible mode -bool ChatHandler::HandleGMVisibleCommand(const char* args) +bool ChatHandler::HandleGMVisibleCommand(char* args) { if (!*args) { @@ -232,7 +232,7 @@ bool ChatHandler::HandleGMVisibleCommand(const char* args) return true; } - std::string argstr = (char*)args; + std::string argstr = args; if (argstr == "on") { @@ -255,12 +255,12 @@ bool ChatHandler::HandleGMVisibleCommand(const char* args) -bool ChatHandler::HandleGPSCommand(const char* args) +bool ChatHandler::HandleGPSCommand(char* args) { WorldObject *obj = NULL; if (*args) { - uint64 guid = extractGuidFromLink((char*)args); + uint64 guid = extractGuidFromLink(args); if(guid) obj = (WorldObject*)m_session->GetPlayer()->GetObjectByTypeMask(guid, TYPEMASK_CREATURE_OR_GAMEOBJECT); @@ -355,12 +355,12 @@ bool ChatHandler::HandleGPSCommand(const char* args) } //Summon Player -bool ChatHandler::HandleNamegoCommand(const char* args) +bool ChatHandler::HandleNamegoCommand(char* args) { Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(args,&target,&target_guid,&target_name)) return false; Player* _player = m_session->GetPlayer(); @@ -476,12 +476,12 @@ bool ChatHandler::HandleNamegoCommand(const char* args) } //Teleport to Player -bool ChatHandler::HandleGonameCommand(const char* args) +bool ChatHandler::HandleGonameCommand(char* args) { Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(args,&target,&target_guid,&target_name)) return false; Player* _player = m_session->GetPlayer(); @@ -615,10 +615,10 @@ bool ChatHandler::HandleGonameCommand(const char* args) } // Teleport player to last position -bool ChatHandler::HandleRecallCommand(const char* args) +bool ChatHandler::HandleRecallCommand(char* args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if(!extractPlayerTarget(args,&target)) return false; // check online security @@ -636,24 +636,13 @@ bool ChatHandler::HandleRecallCommand(const char* args) } //Edit Player HP -bool ChatHandler::HandleModifyHPCommand(const char* args) +bool ChatHandler::HandleModifyHPCommand(char* args) { if(!*args) return false; - // char* pHp = strtok((char*)args, " "); - // if (!pHp) - // return false; - - // char* pHpMax = strtok(NULL, " "); - // if (!pHpMax) - // return false; - - // int32 hpm = atoi(pHpMax); - // int32 hp = atoi(pHp); - - int32 hp = atoi((char*)args); - int32 hpm = atoi((char*)args); + int32 hp = atoi(args); + int32 hpm = atoi(args); if (hp <= 0 || hpm <= 0 || hpm < hp) { @@ -685,23 +674,13 @@ bool ChatHandler::HandleModifyHPCommand(const char* args) } //Edit Player Mana -bool ChatHandler::HandleModifyManaCommand(const char* args) +bool ChatHandler::HandleModifyManaCommand(char* args) { if(!*args) return false; - // char* pmana = strtok((char*)args, " "); - // if (!pmana) - // return false; - - // char* pmanaMax = strtok(NULL, " "); - // if (!pmanaMax) - // return false; - - // int32 manam = atoi(pmanaMax); - // int32 mana = atoi(pmana); - int32 mana = atoi((char*)args); - int32 manam = atoi((char*)args); + int32 mana = atoi(args); + int32 manam = atoi(args); if (mana <= 0 || manam <= 0 || manam < mana) { @@ -733,24 +712,13 @@ bool ChatHandler::HandleModifyManaCommand(const char* args) } //Edit Player Energy -bool ChatHandler::HandleModifyEnergyCommand(const char* args) +bool ChatHandler::HandleModifyEnergyCommand(char* args) { if(!*args) return false; - // char* pmana = strtok((char*)args, " "); - // if (!pmana) - // return false; - - // char* pmanaMax = strtok(NULL, " "); - // if (!pmanaMax) - // return false; - - // int32 manam = atoi(pmanaMax); - // int32 mana = atoi(pmana); - - int32 energy = atoi((char*)args)*10; - int32 energym = atoi((char*)args)*10; + int32 energy = atoi(args)*10; + int32 energym = atoi(args)*10; if (energy <= 0 || energym <= 0 || energym < energy) { @@ -784,24 +752,13 @@ bool ChatHandler::HandleModifyEnergyCommand(const char* args) } //Edit Player Rage -bool ChatHandler::HandleModifyRageCommand(const char* args) +bool ChatHandler::HandleModifyRageCommand(char* args) { if(!*args) return false; - // char* pmana = strtok((char*)args, " "); - // if (!pmana) - // return false; - - // char* pmanaMax = strtok(NULL, " "); - // if (!pmanaMax) - // return false; - - // int32 manam = atoi(pmanaMax); - // int32 mana = atoi(pmana); - - int32 rage = atoi((char*)args)*10; - int32 ragem = atoi((char*)args)*10; + int32 rage = atoi(args)*10; + int32 ragem = atoi(args)*10; if (rage <= 0 || ragem <= 0 || ragem < rage) { @@ -833,13 +790,13 @@ bool ChatHandler::HandleModifyRageCommand(const char* args) } // Edit Player Runic Power -bool ChatHandler::HandleModifyRunicPowerCommand(const char* args) +bool ChatHandler::HandleModifyRunicPowerCommand(char* args) { if(!*args) return false; - int32 rune = atoi((char*)args)*10; - int32 runem = atoi((char*)args)*10; + int32 rune = atoi(args)*10; + int32 runem = atoi(args)*10; if (rune <= 0 || runem <= 0 || runem < rune) { @@ -867,12 +824,12 @@ bool ChatHandler::HandleModifyRunicPowerCommand(const char* args) } //Edit Player Faction -bool ChatHandler::HandleModifyFactionCommand(const char* args) +bool ChatHandler::HandleModifyFactionCommand(char* args) { if(!*args) return false; - char* pfactionid = extractKeyFromLink((char*)args,"Hfaction"); + char* pfactionid = extractKeyFromLink(args,"Hfaction"); Creature* chr = getSelectedCreature(); if(!chr) @@ -945,10 +902,10 @@ bool ChatHandler::HandleModifyFactionCommand(const char* args) } //Edit Player Spell -bool ChatHandler::HandleModifySpellCommand(const char* args) +bool ChatHandler::HandleModifySpellCommand(char* args) { if(!*args) return false; - char* pspellflatid = strtok((char*)args, " "); + char* pspellflatid = strtok(args, " "); if (!pspellflatid) return false; @@ -999,12 +956,12 @@ bool ChatHandler::HandleModifySpellCommand(const char* args) } //Edit Player TP -bool ChatHandler::HandleModifyTalentCommand (const char* args) +bool ChatHandler::HandleModifyTalentCommand (char* args) { if (!*args) return false; - int tp = atoi((char*)args); + int tp = atoi(args); if (tp < 0) return false; @@ -1047,7 +1004,7 @@ bool ChatHandler::HandleModifyTalentCommand (const char* args) } //Enable On\OFF all taxi paths -bool ChatHandler::HandleTaxiCheatCommand(const char* args) +bool ChatHandler::HandleTaxiCheatCommand(char* args) { if (!*args) { @@ -1056,7 +1013,7 @@ bool ChatHandler::HandleTaxiCheatCommand(const char* args) return false; } - std::string argstr = (char*)args; + std::string argstr = args; Player *chr = getSelectedPlayer(); if (!chr) @@ -1093,12 +1050,12 @@ bool ChatHandler::HandleTaxiCheatCommand(const char* args) } //Edit Player Aspeed -bool ChatHandler::HandleModifyASpeedCommand(const char* args) +bool ChatHandler::HandleModifyASpeedCommand(char* args) { if (!*args) return false; - float modSpeed = (float)atof((char*)args); + float modSpeed = (float)atof(args); if (modSpeed > 10 || modSpeed < 0.1) { @@ -1141,12 +1098,12 @@ bool ChatHandler::HandleModifyASpeedCommand(const char* args) } //Edit Player Speed -bool ChatHandler::HandleModifySpeedCommand(const char* args) +bool ChatHandler::HandleModifySpeedCommand(char* args) { if (!*args) return false; - float modSpeed = (float)atof((char*)args); + float modSpeed = (float)atof(args); if (modSpeed > 10 || modSpeed < 0.1) { @@ -1186,12 +1143,12 @@ bool ChatHandler::HandleModifySpeedCommand(const char* args) } //Edit Player Swim Speed -bool ChatHandler::HandleModifySwimCommand(const char* args) +bool ChatHandler::HandleModifySwimCommand(char* args) { if (!*args) return false; - float modSpeed = (float)atof((char*)args); + float modSpeed = (float)atof(args); if (modSpeed > 10.0f || modSpeed < 0.01f) { @@ -1231,12 +1188,12 @@ bool ChatHandler::HandleModifySwimCommand(const char* args) } //Edit Player Walk Speed -bool ChatHandler::HandleModifyBWalkCommand(const char* args) +bool ChatHandler::HandleModifyBWalkCommand(char* args) { if (!*args) return false; - float modSpeed = (float)atof((char*)args); + float modSpeed = (float)atof(args); if (modSpeed > 10.0f || modSpeed < 0.1f) { @@ -1276,12 +1233,12 @@ bool ChatHandler::HandleModifyBWalkCommand(const char* args) } //Edit Player Fly -bool ChatHandler::HandleModifyFlyCommand(const char* args) +bool ChatHandler::HandleModifyFlyCommand(char* args) { if (!*args) return false; - float modSpeed = (float)atof((char*)args); + float modSpeed = (float)atof(args); if (modSpeed > 10.0f || modSpeed < 0.1f) { @@ -1312,12 +1269,12 @@ bool ChatHandler::HandleModifyFlyCommand(const char* args) } //Edit Player Scale -bool ChatHandler::HandleModifyScaleCommand(const char* args) +bool ChatHandler::HandleModifyScaleCommand(char* args) { if (!*args) return false; - float Scale = (float)atof((char*)args); + float Scale = (float)atof(args); if (Scale > 10.0f || Scale <= 0.0f) { SendSysMessage(LANG_BAD_VALUE); @@ -1350,16 +1307,14 @@ bool ChatHandler::HandleModifyScaleCommand(const char* args) } //Enable Player mount -bool ChatHandler::HandleModifyMountCommand(const char* args) +bool ChatHandler::HandleModifyMountCommand(char* args) { if(!*args) return false; uint16 mId = 1147; float speed = (float)15; - uint32 num = 0; - - num = atoi((char*)args); + uint32 num = atoi(args); switch(num) { case 1: @@ -1576,7 +1531,7 @@ bool ChatHandler::HandleModifyMountCommand(const char* args) } Player *chr = getSelectedPlayer(); - if (chr == NULL) + if (!chr) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -1611,7 +1566,7 @@ bool ChatHandler::HandleModifyMountCommand(const char* args) } //Edit Player money -bool ChatHandler::HandleModifyMoneyCommand(const char* args) +bool ChatHandler::HandleModifyMoneyCommand(char* args) { if (!*args) return false; @@ -1628,7 +1583,7 @@ bool ChatHandler::HandleModifyMoneyCommand(const char* args) if (HasLowerSecurity(chr, 0)) return false; - int32 addmoney = atoi((char*)args); + int32 addmoney = atoi(args); uint32 moneyuser = chr->GetMoney(); @@ -1674,7 +1629,7 @@ bool ChatHandler::HandleModifyMoneyCommand(const char* args) } //Edit Unit field -bool ChatHandler::HandleModifyBitCommand(const char* args) +bool ChatHandler::HandleModifyBitCommand(char* args) { if( !*args ) return false; @@ -1691,7 +1646,7 @@ bool ChatHandler::HandleModifyBitCommand(const char* args) if (unit->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player *)unit, 0)) return false; - char* pField = strtok((char*)args, " "); + char* pField = strtok(args, " "); if (!pField) return false; @@ -1728,7 +1683,7 @@ bool ChatHandler::HandleModifyBitCommand(const char* args) return true; } -bool ChatHandler::HandleModifyHonorCommand (const char* args) +bool ChatHandler::HandleModifyHonorCommand (char* args) { if (!*args) return false; @@ -1745,7 +1700,7 @@ bool ChatHandler::HandleModifyHonorCommand (const char* args) if (HasLowerSecurity(target, 0)) return false; - int32 amount = (uint32)atoi(args); + int32 amount = (int32)atoi(args); target->ModifyHonorPoints(amount); @@ -1754,7 +1709,7 @@ bool ChatHandler::HandleModifyHonorCommand (const char* args) return true; } -bool ChatHandler::HandleTeleCommand(const char * args) +bool ChatHandler::HandleTeleCommand(char* args) { if(!*args) return false; @@ -1762,7 +1717,7 @@ bool ChatHandler::HandleTeleCommand(const char * args) Player* _player = m_session->GetPlayer(); // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r - GameTele const* tele = extractGameTeleFromLink((char*)args); + GameTele const* tele = extractGameTeleFromLink(args); if (!tele) { @@ -1774,7 +1729,7 @@ bool ChatHandler::HandleTeleCommand(const char * args) return HandleGoHelper(_player, tele->mapId, tele->position_x, tele->position_y, &tele->position_z, &tele->orientation); } -bool ChatHandler::HandleLookupAreaCommand(const char* args) +bool ChatHandler::HandleLookupAreaCommand(char* args) { if (!*args) return false; @@ -1841,7 +1796,7 @@ bool ChatHandler::HandleLookupAreaCommand(const char* args) } //Find tele in game_tele order by name -bool ChatHandler::HandleLookupTeleCommand(const char * args) +bool ChatHandler::HandleLookupTeleCommand(char * args) { if(!*args) { @@ -1850,7 +1805,7 @@ bool ChatHandler::HandleLookupTeleCommand(const char * args) return false; } - char const* str = strtok((char*)args, " "); + char const* str = strtok(args, " "); if(!str) return false; @@ -1888,7 +1843,7 @@ bool ChatHandler::HandleLookupTeleCommand(const char * args) } //Enable\Dissable accept whispers (for GM) -bool ChatHandler::HandleWhispersCommand(const char* args) +bool ChatHandler::HandleWhispersCommand(char* args) { if(!*args) { @@ -1896,7 +1851,7 @@ bool ChatHandler::HandleWhispersCommand(const char* args) return true; } - std::string argstr = (char*)args; + std::string argstr = args; // whisper on if (argstr == "on") { @@ -1919,7 +1874,7 @@ bool ChatHandler::HandleWhispersCommand(const char* args) } //Save all players in the world -bool ChatHandler::HandleSaveAllCommand(const char* /*args*/) +bool ChatHandler::HandleSaveAllCommand(char* /*args*/) { sObjectAccessor.SaveAllPlayers(); SendSysMessage(LANG_PLAYERS_SAVED); @@ -1927,13 +1882,13 @@ bool ChatHandler::HandleSaveAllCommand(const char* /*args*/) } //Send mail by command -bool ChatHandler::HandleSendMailCommand(const char* args) +bool ChatHandler::HandleSendMailCommand(char* args) { // format: name "subject text" "mail text" Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(args, &target, &target_guid, &target_name)) return false; char* tail1 = strtok(NULL, ""); @@ -1968,23 +1923,23 @@ bool ChatHandler::HandleSendMailCommand(const char* args) } // teleport player to given game_tele.entry -bool ChatHandler::HandleTeleNameCommand(const char * args) +bool ChatHandler::HandleTeleNameCommand(char* args) { char* nameStr; char* teleStr; - extractOptFirstArg((char*)args,&nameStr,&teleStr); - if(!teleStr) + extractOptFirstArg(args, &nameStr, &teleStr); + if (!teleStr) return false; Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) return false; // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r GameTele const* tele = extractGameTeleFromLink(teleStr); - if(!tele) + if (!tele) { SendSysMessage(LANG_COMMAND_TELE_NOTFOUND); SetSentErrorMessage(true); @@ -2029,9 +1984,9 @@ bool ChatHandler::HandleTeleNameCommand(const char * args) } //Teleport group to given game_tele.entry -bool ChatHandler::HandleTeleGroupCommand(const char * args) +bool ChatHandler::HandleTeleGroupCommand(char * args) { - if(!*args) + if (!*args) return false; Player *player = getSelectedPlayer(); @@ -2047,7 +2002,7 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args) return false; // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r - GameTele const* tele = extractGameTeleFromLink((char*)args); + GameTele const* tele = extractGameTeleFromLink(args); if(!tele) { SendSysMessage(LANG_COMMAND_TELE_NOTFOUND); @@ -2105,10 +2060,10 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args) } //Summon group of player -bool ChatHandler::HandleGroupgoCommand(const char* args) +bool ChatHandler::HandleGroupgoCommand(char* args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget(args, &target)) return false; // check online security @@ -2245,14 +2200,14 @@ bool ChatHandler::HandleGoHelper( Player* player, uint32 mapid, float x, float y return true; } -bool ChatHandler::HandleGoTaxinodeCommand(const char* args) +bool ChatHandler::HandleGoTaxinodeCommand(char* args) { Player* _player = m_session->GetPlayer(); if (!*args) return false; - char* cNodeId = extractKeyFromLink((char*)args,"Htaxinode"); + char* cNodeId = extractKeyFromLink(args, "Htaxinode"); if (!cNodeId) return false; @@ -2278,7 +2233,7 @@ bool ChatHandler::HandleGoTaxinodeCommand(const char* args) return HandleGoHelper(_player, node->map_id, node->x, node->y, &node->z); } -bool ChatHandler::HandleGoCommand(const char* args) +bool ChatHandler::HandleGoCommand(char* args) { if(!*args) return false; @@ -2291,7 +2246,7 @@ bool ChatHandler::HandleGoCommand(const char* args) // raw coordinates case if (isNumeric(args[0]) || args[0] == '-') { - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); char* py = strtok(NULL, " "); char* pz = strtok(NULL, " "); char* pmapid = strtok(NULL, " "); @@ -2309,7 +2264,7 @@ bool ChatHandler::HandleGoCommand(const char* args) } // link case - else if (!extractLocationFromLink((char*)args, mapid, x, y, z)) + else if (!extractLocationFromLink(args, mapid, x, y, z)) return false; return HandleGoHelper(_player, mapid, x, y, &z); @@ -2318,14 +2273,14 @@ bool ChatHandler::HandleGoCommand(const char* args) //teleport at coordinates -bool ChatHandler::HandleGoXYCommand(const char* args) +bool ChatHandler::HandleGoXYCommand(char* args) { - if(!*args) + if (!*args) return false; Player* _player = m_session->GetPlayer(); - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); char* py = strtok(NULL, " "); char* pmapid = strtok(NULL, " "); @@ -2343,14 +2298,14 @@ bool ChatHandler::HandleGoXYCommand(const char* args) } //teleport at coordinates, including Z -bool ChatHandler::HandleGoXYZCommand(const char* args) +bool ChatHandler::HandleGoXYZCommand(char* args) { - if(!*args) + if (!*args) return false; Player* _player = m_session->GetPlayer(); - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); char* py = strtok(NULL, " "); char* pz = strtok(NULL, " "); char* pmapid = strtok(NULL, " "); @@ -2371,18 +2326,18 @@ bool ChatHandler::HandleGoXYZCommand(const char* args) } //teleport at coordinates -bool ChatHandler::HandleGoZoneXYCommand(const char* args) +bool ChatHandler::HandleGoZoneXYCommand(char* args) { - if(!*args) + if (!*args) return false; Player* _player = m_session->GetPlayer(); - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); char* py = strtok(NULL, " "); char* tail = strtok(NULL,""); - char* cAreaId = extractKeyFromLink(tail,"Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r + char* cAreaId = extractKeyFromLink(tail, "Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r if (!px || !py) return false; @@ -2430,14 +2385,14 @@ bool ChatHandler::HandleGoZoneXYCommand(const char* args) } //teleport to grid -bool ChatHandler::HandleGoGridCommand(const char* args) +bool ChatHandler::HandleGoGridCommand(char* args) { if (!*args) return false; Player* _player = m_session->GetPlayer(); - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); char* py = strtok(NULL, " "); char* pmapid = strtok(NULL, " "); @@ -2455,7 +2410,7 @@ bool ChatHandler::HandleGoGridCommand(const char* args) return HandleGoHelper(_player, mapid, x, y); } -bool ChatHandler::HandleModifyDrunkCommand(const char* args) +bool ChatHandler::HandleModifyDrunkCommand(char* args) { if(!*args) return false; diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index d75a4dfd0..997f152e3 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -51,18 +51,18 @@ static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] = }; //mute player for some times -bool ChatHandler::HandleMuteCommand(const char* args) +bool ChatHandler::HandleMuteCommand(char* args) { char* nameStr; char* delayStr; - extractOptFirstArg((char*)args,&nameStr,&delayStr); + extractOptFirstArg(args, &nameStr, &delayStr); if (!delayStr) return false; Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid); @@ -97,12 +97,12 @@ bool ChatHandler::HandleMuteCommand(const char* args) } //unmute player -bool ChatHandler::HandleUnmuteCommand(const char* args) +bool ChatHandler::HandleUnmuteCommand(char* args) { Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(args, &target, &target_guid, &target_name)) return false; uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid); @@ -185,7 +185,7 @@ void ChatHandler::ShowTriggerListHelper( AreaTriggerEntry const * atEntry ) ShowTriggerTargetListHelper(atEntry->id, at, true); } -bool ChatHandler::HandleTriggerCommand(const char* args) +bool ChatHandler::HandleTriggerCommand(char* args) { AreaTriggerEntry const* atEntry = NULL; @@ -194,7 +194,7 @@ bool ChatHandler::HandleTriggerCommand(const char* args) // select by args if (*args) { - char *atId = extractKeyFromLink((char*)args, "Hareatrigger"); + char *atId = extractKeyFromLink(args, "Hareatrigger"); if (!atId) return false; @@ -304,7 +304,7 @@ bool ChatHandler::HandleTriggerCommand(const char* args) return true; } -bool ChatHandler::HandleTriggerActiveCommand(const char* args) +bool ChatHandler::HandleTriggerActiveCommand(char* /*args*/) { uint32 counter = 0; // Counter for figure out that we found smth. @@ -331,7 +331,7 @@ bool ChatHandler::HandleTriggerActiveCommand(const char* args) return true; } -bool ChatHandler::HandleTriggerNearCommand(const char* args) +bool ChatHandler::HandleTriggerNearCommand(char* args) { float distance = (!*args) ? 10.0f : (float)atof(args); float dist2 = distance*distance; @@ -398,7 +398,7 @@ static char const* const areatriggerKeys[] = NULL }; -bool ChatHandler::HandleGoTriggerCommand(const char* args) +bool ChatHandler::HandleGoTriggerCommand(char* args) { Player* _player = m_session->GetPlayer(); @@ -407,7 +407,7 @@ bool ChatHandler::HandleGoTriggerCommand(const char* args) int keyIdx; // not index - char *atId = extractKeyFromLink((char*)args, areatriggerKeys, &keyIdx); + char *atId = extractKeyFromLink(args, areatriggerKeys, &keyIdx); if (!atId) return false; @@ -448,14 +448,14 @@ bool ChatHandler::HandleGoTriggerCommand(const char* args) return HandleGoHelper(_player, atEntry->mapid, atEntry->x, atEntry->y, &atEntry->z); } -bool ChatHandler::HandleGoGraveyardCommand(const char* args) +bool ChatHandler::HandleGoGraveyardCommand(char* args) { Player* _player = m_session->GetPlayer(); if (!*args) return false; - char *gyId = strtok((char*)args, " "); + char *gyId = strtok(args, " "); if (!gyId) return false; @@ -477,16 +477,16 @@ bool ChatHandler::HandleGoGraveyardCommand(const char* args) /** \brief Teleport the GM to the specified creature * -* .gocreature --> TP using creature.guid -* .gocreature azuregos --> TP player to the mob with this name +* .go creature --> TP using creature.guid +* .go creature azuregos --> TP player to the mob with this name * Warning: If there is more than one mob with this name * you will be teleported to the first one that is found. -* .gocreature id 6109 --> TP player to the mob, that has this creature_template.entry +* .go creature id 6109 --> TP player to the mob, that has this creature_template.entry * Warning: If there is more than one mob with this "id" * you will be teleported to the first one that is found. */ //teleport to creature -bool ChatHandler::HandleGoCreatureCommand(const char* args) +bool ChatHandler::HandleGoCreatureCommand(char* args) { if (!*args) return false; @@ -494,7 +494,7 @@ bool ChatHandler::HandleGoCreatureCommand(const char* args) Player* _player = m_session->GetPlayer(); // "id" or number or [name] Shift-click form |color|Hcreature:creature_id|h[name]|h|r - char* pParam1 = extractKeyFromLink((char*)args,"Hcreature"); + char* pParam1 = extractKeyFromLink(args, "Hcreature"); if (!pParam1) return false; @@ -596,7 +596,7 @@ bool ChatHandler::HandleGoCreatureCommand(const char* args) } //teleport to gameobject -bool ChatHandler::HandleGoObjectCommand(const char* args) +bool ChatHandler::HandleGoObjectCommand(char* args) { if (!*args) return false; @@ -604,7 +604,7 @@ bool ChatHandler::HandleGoObjectCommand(const char* args) Player* _player = m_session->GetPlayer(); // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* pParam1 = extractKeyFromLink((char*)args,"Hgameobject"); + char* pParam1 = extractKeyFromLink(args, "Hgameobject"); if (!pParam1) return false; @@ -705,7 +705,7 @@ bool ChatHandler::HandleGoObjectCommand(const char* args) return HandleGoHelper(_player, data->mapid, data->posX, data->posY, &data->posZ); } -bool ChatHandler::HandleGameObjectTargetCommand(const char* args) +bool ChatHandler::HandleGameObjectTargetCommand(char* args) { Player* pl = m_session->GetPlayer(); QueryResult *result; @@ -713,7 +713,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) if (*args) { // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameobject_entry"); + char* cId = extractKeyFromLink(args, "Hgameobject_entry"); if (!cId) return false; @@ -823,10 +823,10 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) } //delete object by selection or guid -bool ChatHandler::HandleGameObjectDeleteCommand(const char* args) +bool ChatHandler::HandleGameObjectDeleteCommand(char* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = extractKeyFromLink(args, "Hgameobject"); if (!cId) return false; @@ -871,10 +871,10 @@ bool ChatHandler::HandleGameObjectDeleteCommand(const char* args) } //turn selected object -bool ChatHandler::HandleGameObjectTurnCommand(const char* args) +bool ChatHandler::HandleGameObjectTurnCommand(char* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = extractKeyFromLink(args, "Hgameobject"); if (!cId) return false; @@ -925,10 +925,10 @@ bool ChatHandler::HandleGameObjectTurnCommand(const char* args) } //move selected object -bool ChatHandler::HandleGameObjectMoveCommand(const char* args) +bool ChatHandler::HandleGameObjectMoveCommand(char* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = extractKeyFromLink(args,"Hgameobject"); if (!cId) return false; @@ -997,13 +997,13 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args) } //spawn go -bool ChatHandler::HandleGameObjectAddCommand(const char* args) +bool ChatHandler::HandleGameObjectAddCommand(char* args) { if (!*args) return false; // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameobject_entry"); + char* cId = extractKeyFromLink(args, "Hgameobject_entry"); if (!cId) return false; @@ -1076,10 +1076,10 @@ bool ChatHandler::HandleGameObjectAddCommand(const char* args) } //set pahsemask for selected object -bool ChatHandler::HandleGameObjectPhaseCommand(const char* args) +bool ChatHandler::HandleGameObjectPhaseCommand(char* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = extractKeyFromLink(args, "Hgameobject"); if (!cId) return false; @@ -1114,7 +1114,7 @@ bool ChatHandler::HandleGameObjectPhaseCommand(const char* args) return true; } -bool ChatHandler::HandleGameObjectNearCommand(const char* args) +bool ChatHandler::HandleGameObjectNearCommand(char* args) { float distance = (!*args) ? 10.0f : (float)atof(args); uint32 count = 0; @@ -1155,7 +1155,7 @@ bool ChatHandler::HandleGameObjectNearCommand(const char* args) return true; } -bool ChatHandler::HandleGUIDCommand(const char* /*args*/) +bool ChatHandler::HandleGUIDCommand(char* /*args*/) { uint64 guid = m_session->GetPlayer()->GetSelection(); @@ -1209,7 +1209,7 @@ void ChatHandler::ShowFactionListHelper( FactionEntry const * factionEntry, Loca SendSysMessage(ss.str().c_str()); } -bool ChatHandler::HandleLookupFactionCommand(const char* args) +bool ChatHandler::HandleLookupFactionCommand(char* args) { if (!*args) return false; @@ -1269,9 +1269,10 @@ bool ChatHandler::HandleLookupFactionCommand(const char* args) return true; } -bool ChatHandler::HandleModifyRepCommand(const char * args) +bool ChatHandler::HandleModifyRepCommand(char* args) { - if (!*args) return false; + if (!*args) + return false; Player* target = NULL; target = getSelectedPlayer(); @@ -1287,7 +1288,7 @@ bool ChatHandler::HandleModifyRepCommand(const char * args) if (HasLowerSecurity(target, 0)) return false; - char* factionTxt = extractKeyFromLink((char*)args,"Hfaction"); + char* factionTxt = extractKeyFromLink(args, "Hfaction"); if (!factionTxt) return false; @@ -1371,11 +1372,11 @@ bool ChatHandler::HandleModifyRepCommand(const char * args) //-----------------------Npc Commands----------------------- //add spawn of creature -bool ChatHandler::HandleNpcAddCommand(const char* args) +bool ChatHandler::HandleNpcAddCommand(char* args) { if (!*args) return false; - char* charID = extractKeyFromLink((char*)args,"Hcreature_entry"); + char* charID = extractKeyFromLink(args, "Hcreature_entry"); if (!charID) return false; @@ -1422,12 +1423,12 @@ bool ChatHandler::HandleNpcAddCommand(const char* args) } //add item in vendorlist -bool ChatHandler::HandleNpcAddVendorItemCommand(const char* args) +bool ChatHandler::HandleNpcAddVendorItemCommand(char* args) { if (!*args) return false; - char* pitem = extractKeyFromLink((char*)args,"Hitem"); + char* pitem = extractKeyFromLink(args, "Hitem"); if (!pitem) { SendSysMessage(LANG_COMMAND_NEEDITEMSEND); @@ -1469,7 +1470,7 @@ bool ChatHandler::HandleNpcAddVendorItemCommand(const char* args) } //del item from vendor list -bool ChatHandler::HandleNpcDelVendorItemCommand(const char* args) +bool ChatHandler::HandleNpcDelVendorItemCommand(char* args) { if (!*args) return false; @@ -1482,7 +1483,7 @@ bool ChatHandler::HandleNpcDelVendorItemCommand(const char* args) return false; } - char* pitem = extractKeyFromLink((char*)args,"Hitem"); + char* pitem = extractKeyFromLink(args, "Hitem"); if (!pitem) { SendSysMessage(LANG_COMMAND_NEEDITEMSEND); @@ -1505,15 +1506,15 @@ bool ChatHandler::HandleNpcDelVendorItemCommand(const char* args) } //add move for creature -bool ChatHandler::HandleNpcAddMoveCommand(const char* args) +bool ChatHandler::HandleNpcAddMoveCommand(char* args) { if (!*args) return false; - char* guid_str = strtok((char*)args, " "); - char* wait_str = strtok((char*)NULL, " "); + char* guid_str = strtok(args, " "); + char* wait_str = strtok(NULL, " "); - uint32 lowguid = atoi((char*)guid_str); + uint32 lowguid = atoi(guid_str); Creature* pCreature = NULL; @@ -1568,12 +1569,12 @@ bool ChatHandler::HandleNpcAddMoveCommand(const char* args) } //change level of creature or pet -bool ChatHandler::HandleNpcChangeLevelCommand(const char* args) +bool ChatHandler::HandleNpcChangeLevelCommand(char* args) { if (!*args) return false; - uint8 lvl = (uint8) atoi((char*)args); + uint8 lvl = (uint8) atoi(args); if (lvl < 1 || lvl > sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL) + 3) { SendSysMessage(LANG_BAD_VALUE); @@ -1610,12 +1611,12 @@ bool ChatHandler::HandleNpcChangeLevelCommand(const char* args) } //set npcflag of creature -bool ChatHandler::HandleNpcFlagCommand(const char* args) +bool ChatHandler::HandleNpcFlagCommand(char* args) { if (!*args) return false; - uint32 npcFlags = (uint32) atoi((char*)args); + uint32 npcFlags = (uint32) atoi(args); Creature* pCreature = getSelectedCreature(); @@ -1635,14 +1636,14 @@ bool ChatHandler::HandleNpcFlagCommand(const char* args) return true; } -bool ChatHandler::HandleNpcDeleteCommand(const char* args) +bool ChatHandler::HandleNpcDeleteCommand(char* args) { Creature* unit = NULL; if (*args) { // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hcreature"); + char* cId = extractKeyFromLink(args, "Hcreature"); if (!cId) return false; @@ -1674,7 +1675,7 @@ bool ChatHandler::HandleNpcDeleteCommand(const char* args) } //move selected creature -bool ChatHandler::HandleNpcMoveCommand(const char* args) +bool ChatHandler::HandleNpcMoveCommand(char* args) { uint32 lowguid = 0; @@ -1683,7 +1684,7 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args) if (!pCreature) { // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r - char* cId = extractKeyFromLink((char*)args, "Hcreature"); + char* cId = extractKeyFromLink(args, "Hcreature"); if (!cId) return false; @@ -1764,7 +1765,7 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args) * additional parameter: NODEL - so no waypoints are deleted, if you * change the movement type */ -bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) +bool ChatHandler::HandleNpcSetMoveTypeCommand(char* args) { if (!*args) return false; @@ -1776,9 +1777,9 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) // this is very handy if you want to do waypoints, that are // later switched on/off according to special events (like escort // quests, etc) - char* guid_str = strtok((char*)args, " "); - char* type_str = strtok((char*)NULL, " "); - char* dontdel_str = strtok((char*)NULL, " "); + char* guid_str = strtok(args, " "); + char* type_str = strtok(NULL, " "); + char* dontdel_str = strtok(NULL, " "); bool doNotDelete = false; @@ -1895,12 +1896,12 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) } //set model of creature -bool ChatHandler::HandleNpcSetModelCommand(const char* args) +bool ChatHandler::HandleNpcSetModelCommand(char* args) { if (!*args) return false; - uint32 displayId = (uint32) atoi((char*)args); + uint32 displayId = (uint32) atoi(args); Creature *pCreature = getSelectedCreature(); @@ -1919,12 +1920,12 @@ bool ChatHandler::HandleNpcSetModelCommand(const char* args) return true; } //set faction of creature -bool ChatHandler::HandleNpcFactionIdCommand(const char* args) +bool ChatHandler::HandleNpcFactionIdCommand(char* args) { if (!*args) return false; - uint32 factionId = (uint32) atoi((char*)args); + uint32 factionId = (uint32) atoi(args); if (!sFactionTemplateStore.LookupEntry(factionId)) { @@ -1959,12 +1960,12 @@ bool ChatHandler::HandleNpcFactionIdCommand(const char* args) return true; } //set spawn dist of creature -bool ChatHandler::HandleNpcSpawnDistCommand(const char* args) +bool ChatHandler::HandleNpcSpawnDistCommand(char* args) { if (!*args) return false; - float option = (float)atof((char*)args); + float option = (float)atof(args); if (option < 0.0f) { SendSysMessage(LANG_BAD_VALUE); @@ -1997,17 +1998,17 @@ bool ChatHandler::HandleNpcSpawnDistCommand(const char* args) return true; } //spawn time handling -bool ChatHandler::HandleNpcSpawnTimeCommand(const char* args) +bool ChatHandler::HandleNpcSpawnTimeCommand(char* args) { if (!*args) return false; - char* stime = strtok((char*)args, " "); + char* stime = strtok(args, " "); if (!stime) return false; - int i_stime = atoi((char*)stime); + int i_stime = atoi(stime); if (i_stime < 0) { @@ -2031,7 +2032,7 @@ bool ChatHandler::HandleNpcSpawnTimeCommand(const char* args) return true; } //npc follow handling -bool ChatHandler::HandleNpcFollowCommand(const char* /*args*/) +bool ChatHandler::HandleNpcFollowCommand(char* /*args*/) { Player *player = m_session->GetPlayer(); Creature *creature = getSelectedCreature(); @@ -2050,7 +2051,7 @@ bool ChatHandler::HandleNpcFollowCommand(const char* /*args*/) return true; } //npc unfollow handling -bool ChatHandler::HandleNpcUnFollowCommand(const char* /*args*/) +bool ChatHandler::HandleNpcUnFollowCommand(char* /*args*/) { Player *player = m_session->GetPlayer(); Creature *creature = getSelectedCreature(); @@ -2087,7 +2088,7 @@ bool ChatHandler::HandleNpcUnFollowCommand(const char* /*args*/) return true; } //npc tame handling -bool ChatHandler::HandleNpcTameCommand(const char* /*args*/) +bool ChatHandler::HandleNpcTameCommand(char* /*args*/) { Creature *creatureTarget = getSelectedCreature (); if (!creatureTarget || creatureTarget->isPet ()) @@ -2154,12 +2155,12 @@ bool ChatHandler::HandleNpcTameCommand(const char* /*args*/) } //npc phasemask handling //change phasemask of creature or pet -bool ChatHandler::HandleNpcSetPhaseCommand(const char* args) +bool ChatHandler::HandleNpcSetPhaseCommand(char* args) { if (!*args) return false; - uint32 phasemask = (uint32) atoi((char*)args); + uint32 phasemask = (uint32) atoi(args); if (phasemask == 0) { SendSysMessage(LANG_BAD_VALUE); @@ -2183,7 +2184,7 @@ bool ChatHandler::HandleNpcSetPhaseCommand(const char* args) return true; } //npc deathstate handling -bool ChatHandler::HandleNpcSetDeathStateCommand(const char* args) +bool ChatHandler::HandleNpcSetDeathStateCommand(char* args) { if (!*args) return false; @@ -2215,7 +2216,7 @@ bool ChatHandler::HandleNpcSetDeathStateCommand(const char* args) //TODO: NpcCommands that need to be fixed : -bool ChatHandler::HandleNpcNameCommand(const char* /*args*/) +bool ChatHandler::HandleNpcNameCommand(char* /*args*/) { /* Temp. disabled if (!*args) @@ -2262,7 +2263,7 @@ bool ChatHandler::HandleNpcNameCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleNpcSubNameCommand(const char* /*args*/) +bool ChatHandler::HandleNpcSubNameCommand(char* /*args*/) { /* Temp. disabled @@ -2309,13 +2310,13 @@ bool ChatHandler::HandleNpcSubNameCommand(const char* /*args*/) } //move item to other slot -bool ChatHandler::HandleItemMoveCommand(const char* args) +bool ChatHandler::HandleItemMoveCommand(char* args) { if (!*args) return false; uint8 srcslot, dstslot; - char* pParam1 = strtok((char*)args, " "); + char* pParam1 = strtok(args, " "); if (!pParam1) return false; @@ -2345,7 +2346,7 @@ bool ChatHandler::HandleItemMoveCommand(const char* args) } //demorph player or unit -bool ChatHandler::HandleDeMorphCommand(const char* /*args*/) +bool ChatHandler::HandleDeMorphCommand(char* /*args*/) { Unit *target = getSelectedUnit(); if (!target) @@ -2362,12 +2363,12 @@ bool ChatHandler::HandleDeMorphCommand(const char* /*args*/) } //morph creature or player -bool ChatHandler::HandleModifyMorphCommand(const char* args) +bool ChatHandler::HandleModifyMorphCommand(char* args) { if (!*args) return false; - uint16 display_id = (uint16)atoi((char*)args); + uint16 display_id = (uint16)atoi(args); Unit *target = getSelectedUnit(); if (!target) @@ -2383,10 +2384,10 @@ bool ChatHandler::HandleModifyMorphCommand(const char* args) } //kick player -bool ChatHandler::HandleKickPlayerCommand(const char *args) +bool ChatHandler::HandleKickPlayerCommand(char *args) { Player* target; - if (!extractPlayerTarget((char*)args, &target)) + if (!extractPlayerTarget(args, &target)) return false; if (m_session && target == m_session->GetPlayer()) @@ -2401,18 +2402,18 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args) return false; // send before target pointer invalidate - PSendSysMessage(LANG_COMMAND_KICKMESSAGE,GetNameLink(target).c_str()); + PSendSysMessage(LANG_COMMAND_KICKMESSAGE, GetNameLink(target).c_str()); target->GetSession()->KickPlayer(); return true; } //set temporary phase mask for player -bool ChatHandler::HandleModifyPhaseCommand(const char* args) +bool ChatHandler::HandleModifyPhaseCommand(char* args) { if (!*args) return false; - uint32 phasemask = (uint32)atoi((char*)args); + uint32 phasemask = (uint32)atoi(args); Unit *target = getSelectedUnit(); if (!target) @@ -2428,12 +2429,12 @@ bool ChatHandler::HandleModifyPhaseCommand(const char* args) } //show info of player -bool ChatHandler::HandlePInfoCommand(const char* args) +bool ChatHandler::HandlePInfoCommand(char* args) { Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args, &target, &target_guid,& target_name)) + if (!extractPlayerTarget(args, &target, &target_guid,& target_name)) return false; uint32 accId = 0; @@ -2527,9 +2528,9 @@ void ChatHandler::ShowTicket(uint64 guid, char const* text, char const* time) } //ticket commands -bool ChatHandler::HandleTicketCommand(const char* args) +bool ChatHandler::HandleTicketCommand(char* args) { - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); // ticket if (!px) @@ -2668,9 +2669,9 @@ bool ChatHandler::HandleTicketCommand(const char* args) } //dell all tickets -bool ChatHandler::HandleDelTicketCommand(const char *args) +bool ChatHandler::HandleDelTicketCommand(char *args) { - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); if (!px) return false; @@ -2752,7 +2753,7 @@ bool ChatHandler::HandleDelTicketCommand(const char *args) * * @return true - command did succeed, false - something went wrong */ -bool ChatHandler::HandleWpAddCommand(const char* args) +bool ChatHandler::HandleWpAddCommand(char* args) { DEBUG_LOG("DEBUG: HandleWpAddCommand"); @@ -2761,7 +2762,7 @@ bool ChatHandler::HandleWpAddCommand(const char* args) if (*args) { - guid_str = strtok((char*)args, " "); + guid_str = strtok(args, " "); } uint32 lowguid = 0; @@ -2915,7 +2916,7 @@ bool ChatHandler::HandleWpAddCommand(const char* args) * * info -> User did not select a visual waypoint and */ -bool ChatHandler::HandleWpModifyCommand(const char* args) +bool ChatHandler::HandleWpModifyCommand(char* args) { DEBUG_LOG("DEBUG: HandleWpModifyCommand"); @@ -2923,7 +2924,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) return false; // first arg: add del text emote spell waittime move - char* show_str = strtok((char*)args, " "); + char* show_str = strtok(args, " "); if (!show_str) { return false; @@ -3324,7 +3325,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) * * */ -bool ChatHandler::HandleWpShowCommand(const char* args) +bool ChatHandler::HandleWpShowCommand(char* args) { DEBUG_LOG("DEBUG: HandleWpShowCommand"); @@ -3332,7 +3333,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) return false; // first arg: on, off, first, last - char* show_str = strtok((char*)args, " "); + char* show_str = strtok(args, " "); if (!show_str) { return false; @@ -3724,7 +3725,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) return true; } // HandleWpShowCommand -bool ChatHandler::HandleWpExportCommand(const char *args) +bool ChatHandler::HandleWpExportCommand(char *args) { if (!*args) return false; @@ -3754,12 +3755,12 @@ bool ChatHandler::HandleWpExportCommand(const char *args) delete result; } - arg_str = strtok((char*)args, " "); + arg_str = strtok(args, " "); } else { // user provided - char* guid_str = strtok((char*)args, " "); + char* guid_str = strtok(args, " "); if (!guid_str) { SendSysMessage(LANG_WAYPOINT_NOGUID); @@ -3842,12 +3843,12 @@ bool ChatHandler::HandleWpExportCommand(const char *args) return true; } -bool ChatHandler::HandleWpImportCommand(const char *args) +bool ChatHandler::HandleWpImportCommand(char *args) { if (!*args) return false; - char* arg_str = strtok((char*)args, " "); + char* arg_str = strtok(args, " "); if (!arg_str) return false; @@ -3870,12 +3871,12 @@ bool ChatHandler::HandleWpImportCommand(const char *args) } //rename characters -bool ChatHandler::HandleCharacterRenameCommand(const char* args) +bool ChatHandler::HandleCharacterRenameCommand(char* args) { Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) + if (!extractPlayerTarget(args, &target, &target_guid, &target_name)) return false; if (target) @@ -3904,12 +3905,12 @@ bool ChatHandler::HandleCharacterRenameCommand(const char* args) } // customize characters -bool ChatHandler::HandleCharacterCustomizeCommand(const char* args) +bool ChatHandler::HandleCharacterCustomizeCommand(char* args) { Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(args, &target, &target_guid, &target_name)) return false; if (target) @@ -3929,10 +3930,10 @@ bool ChatHandler::HandleCharacterCustomizeCommand(const char* args) return true; } -bool ChatHandler::HandleCharacterReputationCommand(const char* args) +bool ChatHandler::HandleCharacterReputationCommand(char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget(args, &target)) return false; LocaleConstant loc = GetSessionDbcLocale(); @@ -3948,12 +3949,12 @@ bool ChatHandler::HandleCharacterReputationCommand(const char* args) } //change standstate -bool ChatHandler::HandleModifyStandStateCommand(const char* args) +bool ChatHandler::HandleModifyStandStateCommand(char* args) { if (!*args) return false; - uint32 anim_id = atoi((char*)args); + uint32 anim_id = atoi(args); if (!sEmotesStore.LookupEntry(anim_id)) return false; @@ -3963,7 +3964,7 @@ bool ChatHandler::HandleModifyStandStateCommand(const char* args) return true; } -bool ChatHandler::HandleHonorAddCommand(const char* args) +bool ChatHandler::HandleHonorAddCommand(char* args) { if (!*args) return false; @@ -3985,7 +3986,7 @@ bool ChatHandler::HandleHonorAddCommand(const char* args) return true; } -bool ChatHandler::HandleHonorAddKillCommand(const char* /*args*/) +bool ChatHandler::HandleHonorAddKillCommand(char* /*args*/) { Unit *target = getSelectedUnit(); if (!target) @@ -4003,7 +4004,7 @@ bool ChatHandler::HandleHonorAddKillCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleHonorUpdateCommand(const char* /*args*/) +bool ChatHandler::HandleHonorUpdateCommand(char* /*args*/) { Player *target = getSelectedPlayer(); if (!target) @@ -4021,7 +4022,7 @@ bool ChatHandler::HandleHonorUpdateCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleLookupEventCommand(const char* args) +bool ChatHandler::HandleLookupEventCommand(char* args) { if (!*args) return false; @@ -4067,7 +4068,7 @@ bool ChatHandler::HandleLookupEventCommand(const char* args) return true; } -bool ChatHandler::HandleEventListCommand(const char* args) +bool ChatHandler::HandleEventListCommand(char* args) { uint32 counter = 0; bool all = false; @@ -4109,13 +4110,13 @@ bool ChatHandler::HandleEventListCommand(const char* args) return true; } -bool ChatHandler::HandleEventInfoCommand(const char* args) +bool ChatHandler::HandleEventInfoCommand(char* args) { if (!*args) return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameevent"); + char* cId = extractKeyFromLink(args, "Hgameevent"); if (!cId) return false; @@ -4158,13 +4159,13 @@ bool ChatHandler::HandleEventInfoCommand(const char* args) return true; } -bool ChatHandler::HandleEventStartCommand(const char* args) +bool ChatHandler::HandleEventStartCommand(char* args) { if (!*args) return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameevent"); + char* cId = extractKeyFromLink(args, "Hgameevent"); if (!cId) return false; @@ -4200,13 +4201,13 @@ bool ChatHandler::HandleEventStartCommand(const char* args) return true; } -bool ChatHandler::HandleEventStopCommand(const char* args) +bool ChatHandler::HandleEventStopCommand(char* args) { if (!*args) return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameevent"); + char* cId = extractKeyFromLink(args, "Hgameevent"); if (!cId) return false; @@ -4243,10 +4244,10 @@ bool ChatHandler::HandleEventStopCommand(const char* args) return true; } -bool ChatHandler::HandleCombatStopCommand(const char* args) +bool ChatHandler::HandleCombatStopCommand(char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget(args, &target)) return false; // check online security @@ -4292,7 +4293,7 @@ void ChatHandler::HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id) } } -bool ChatHandler::HandleLearnAllCraftsCommand(const char* /*args*/) +bool ChatHandler::HandleLearnAllCraftsCommand(char* /*args*/) { for (uint32 i = 0; i < sSkillLineStore.GetNumRows(); ++i) { @@ -4311,7 +4312,7 @@ bool ChatHandler::HandleLearnAllCraftsCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) +bool ChatHandler::HandleLearnAllRecipesCommand(char* args) { // Learns all recipes of specified profession and sets skill to max // Example: .learn all_recipes enchanting @@ -4328,7 +4329,7 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) std::wstring wnamepart; - if (!Utf8toWStr(args,wnamepart)) + if (!Utf8toWStr(args, wnamepart)) return false; // converting string that we try to find to lower case @@ -4388,34 +4389,33 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) return true; } -bool ChatHandler::HandleLookupAccountEmailCommand(const char* args) +bool ChatHandler::HandleLookupAccountEmailCommand(char* args) { if (!*args) return false; - std::string email = strtok ((char*)args, " "); - char* limit_str = strtok (NULL, " "); - uint32 limit = limit_str ? atoi (limit_str) : 100; + std::string email = strtok(args, " "); + char* limit_str = strtok(NULL, " "); + uint32 limit = limit_str ? atoi(limit_str) : 100; - LoginDatabase.escape_string (email); + LoginDatabase.escape_string(email); // 0 1 2 3 4 QueryResult *result = LoginDatabase.PQuery("SELECT id, username, last_ip, gmlevel, expansion FROM account WHERE email "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), email.c_str ()); - return ShowAccountListHelper(result,&limit); + return ShowAccountListHelper(result, &limit); } -bool ChatHandler::HandleLookupAccountIpCommand(const char* args) +bool ChatHandler::HandleLookupAccountIpCommand(char* args) { - if (!*args) return false; - std::string ip = strtok ((char*)args, " "); - char* limit_str = strtok (NULL, " "); - uint32 limit = limit_str ? atoi (limit_str) : 100; + std::string ip = strtok(args, " "); + char* limit_str = strtok(NULL, " "); + uint32 limit = limit_str ? atoi(limit_str) : 100; - LoginDatabase.escape_string (ip); + LoginDatabase.escape_string(ip); // 0 1 2 3 4 QueryResult *result = LoginDatabase.PQuery("SELECT id, username, last_ip, gmlevel, expansion FROM account WHERE last_ip "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), ip.c_str ()); @@ -4423,23 +4423,23 @@ bool ChatHandler::HandleLookupAccountIpCommand(const char* args) return ShowAccountListHelper(result,&limit); } -bool ChatHandler::HandleLookupAccountNameCommand(const char* args) +bool ChatHandler::HandleLookupAccountNameCommand(char* args) { if (!*args) return false; - std::string account = strtok ((char*)args, " "); - char* limit_str = strtok (NULL, " "); - uint32 limit = limit_str ? atoi (limit_str) : 100; + std::string account = strtok(args, " "); + char* limit_str = strtok(NULL, " "); + uint32 limit = limit_str ? atoi(limit_str) : 100; - if (!AccountMgr::normalizeString (account)) + if (!AccountMgr::normalizeString(account)) return false; - LoginDatabase.escape_string (account); + LoginDatabase.escape_string(account); // 0 1 2 3 4 QueryResult *result = LoginDatabase.PQuery("SELECT id, username, last_ip, gmlevel, expansion FROM account WHERE username "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), account.c_str ()); - return ShowAccountListHelper(result,&limit); + return ShowAccountListHelper(result, &limit); } bool ChatHandler::ShowAccountListHelper(QueryResult* result, uint32* limit, bool title, bool error) @@ -4494,57 +4494,55 @@ bool ChatHandler::ShowAccountListHelper(QueryResult* result, uint32* limit, bool return true; } -bool ChatHandler::HandleLookupPlayerIpCommand(const char* args) +bool ChatHandler::HandleLookupPlayerIpCommand(char* args) { - if (!*args) return false; - std::string ip = strtok ((char*)args, " "); - char* limit_str = strtok (NULL, " "); - uint32 limit = limit_str ? atoi (limit_str) : 100; + std::string ip = strtok(args, " "); + char* limit_str = strtok(NULL, " "); + uint32 limit = limit_str ? atoi(limit_str) : 100; - LoginDatabase.escape_string (ip); + LoginDatabase.escape_string(ip); QueryResult* result = LoginDatabase.PQuery ("SELECT id,username FROM account WHERE last_ip "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), ip.c_str ()); - return LookupPlayerSearchCommand (result,&limit); + return LookupPlayerSearchCommand(result, &limit); } -bool ChatHandler::HandleLookupPlayerAccountCommand(const char* args) +bool ChatHandler::HandleLookupPlayerAccountCommand(char* args) { if (!*args) return false; - std::string account = strtok ((char*)args, " "); - char* limit_str = strtok (NULL, " "); - uint32 limit = limit_str ? atoi (limit_str) : 100; + std::string account = strtok(args, " "); + char* limit_str = strtok(NULL, " "); + uint32 limit = limit_str ? atoi(limit_str) : 100; - if (!AccountMgr::normalizeString (account)) + if (!AccountMgr::normalizeString(account)) return false; - LoginDatabase.escape_string (account); + LoginDatabase.escape_string(account); - QueryResult* result = LoginDatabase.PQuery ("SELECT id,username FROM account WHERE username "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), account.c_str ()); + QueryResult* result = LoginDatabase.PQuery("SELECT id,username FROM account WHERE username "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), account.c_str ()); - return LookupPlayerSearchCommand (result,&limit); + return LookupPlayerSearchCommand(result, &limit); } -bool ChatHandler::HandleLookupPlayerEmailCommand(const char* args) +bool ChatHandler::HandleLookupPlayerEmailCommand(char* args) { - if (!*args) return false; - std::string email = strtok ((char*)args, " "); - char* limit_str = strtok (NULL, " "); - uint32 limit = limit_str ? atoi (limit_str) : 100; + std::string email = strtok(args, " "); + char* limit_str = strtok(NULL, " "); + uint32 limit = limit_str ? atoi(limit_str) : 100; - LoginDatabase.escape_string (email); + LoginDatabase.escape_string(email); - QueryResult* result = LoginDatabase.PQuery ("SELECT id,username FROM account WHERE email "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), email.c_str ()); + QueryResult* result = LoginDatabase.PQuery("SELECT id,username FROM account WHERE email "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), email.c_str ()); - return LookupPlayerSearchCommand (result,&limit); + return LookupPlayerSearchCommand(result, &limit); } bool ChatHandler::LookupPlayerSearchCommand(QueryResult* result, uint32* limit) @@ -4599,16 +4597,16 @@ bool ChatHandler::LookupPlayerSearchCommand(QueryResult* result, uint32* limit) } /// Triggering corpses expire check in world -bool ChatHandler::HandleServerCorpsesCommand(const char* /*args*/) +bool ChatHandler::HandleServerCorpsesCommand(char* /*args*/) { sObjectAccessor.RemoveOldCorpses(); return true; } -bool ChatHandler::HandleRepairitemsCommand(const char* args) +bool ChatHandler::HandleRepairitemsCommand(char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget(args, &target)) return false; // check online security @@ -4624,7 +4622,7 @@ bool ChatHandler::HandleRepairitemsCommand(const char* args) return true; } -bool ChatHandler::HandleWaterwalkCommand(const char* args) +bool ChatHandler::HandleWaterwalkCommand(char* args) { if (!*args) return false; @@ -4658,7 +4656,7 @@ bool ChatHandler::HandleWaterwalkCommand(const char* args) return true; } -bool ChatHandler::HandleLookupTitleCommand(const char* args) +bool ChatHandler::HandleLookupTitleCommand(char* args) { if (!*args) return false; @@ -4672,7 +4670,7 @@ bool ChatHandler::HandleLookupTitleCommand(const char* args) std::string namepart = args; std::wstring wnamepart; - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; // converting string that we try to find to lower case @@ -4734,10 +4732,10 @@ bool ChatHandler::HandleLookupTitleCommand(const char* args) return true; } -bool ChatHandler::HandleTitlesAddCommand(const char* args) +bool ChatHandler::HandleTitlesAddCommand(char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = extractKeyFromLink((char*)args,"Htitle"); + char* id_p = extractKeyFromLink(args, "Htitle"); if (!id_p) return false; @@ -4781,10 +4779,10 @@ bool ChatHandler::HandleTitlesAddCommand(const char* args) return true; } -bool ChatHandler::HandleTitlesRemoveCommand(const char* args) +bool ChatHandler::HandleTitlesRemoveCommand(char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = extractKeyFromLink((char*)args,"Htitle"); + char* id_p = extractKeyFromLink(args, "Htitle"); if (!id_p) return false; @@ -4836,14 +4834,14 @@ bool ChatHandler::HandleTitlesRemoveCommand(const char* args) } //Edit Player KnownTitles -bool ChatHandler::HandleTitlesSetMaskCommand(const char* args) +bool ChatHandler::HandleTitlesSetMaskCommand(char* args) { if (!*args) return false; uint64 titles = 0; - sscanf((char*)args, UI64FMTD, &titles); + sscanf(args, UI64FMTD, &titles); Player *target = getSelectedPlayer(); if (!target) @@ -4877,10 +4875,10 @@ bool ChatHandler::HandleTitlesSetMaskCommand(const char* args) return true; } -bool ChatHandler::HandleCharacterTitlesCommand(const char* args) +bool ChatHandler::HandleCharacterTitlesCommand(char* args) { Player* target; - if (!extractPlayerTarget((char*)args, &target)) + if (!extractPlayerTarget(args, &target)) return false; LocaleConstant loc = GetSessionDbcLocale(); @@ -4914,10 +4912,10 @@ bool ChatHandler::HandleCharacterTitlesCommand(const char* args) return true; } -bool ChatHandler::HandleTitlesCurrentCommand(const char* args) +bool ChatHandler::HandleTitlesCurrentCommand(char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = extractKeyFromLink((char*)args, "Htitle"); + char* id_p = extractKeyFromLink(args, "Htitle"); if (!id_p) return false; diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 77c5f9177..9ec63e856 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -54,7 +54,7 @@ #include "DBCEnums.h" //reload commands -bool ChatHandler::HandleReloadAllCommand(const char*) +bool ChatHandler::HandleReloadAllCommand(char* /*args*/) { HandleReloadSkillFishingBaseLevelCommand(""); @@ -77,14 +77,14 @@ bool ChatHandler::HandleReloadAllCommand(const char*) return true; } -bool ChatHandler::HandleReloadAllAchievementCommand(const char*) +bool ChatHandler::HandleReloadAllAchievementCommand(char* /*args*/) { HandleReloadAchievementCriteriaRequirementCommand(""); HandleReloadAchievementRewardCommand(""); return true; } -bool ChatHandler::HandleReloadAllAreaCommand(const char*) +bool ChatHandler::HandleReloadAllAreaCommand(char* /*args*/) { //HandleReloadQuestAreaTriggersCommand(""); -- reloaded in HandleReloadAllQuestCommand HandleReloadAreaTriggerTeleportCommand(""); @@ -93,7 +93,7 @@ bool ChatHandler::HandleReloadAllAreaCommand(const char*) return true; } -bool ChatHandler::HandleReloadAllLootCommand(const char*) +bool ChatHandler::HandleReloadAllLootCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables..." ); LoadLootTables(); @@ -101,9 +101,9 @@ bool ChatHandler::HandleReloadAllLootCommand(const char*) return true; } -bool ChatHandler::HandleReloadAllNpcCommand(const char* args) +bool ChatHandler::HandleReloadAllNpcCommand(char* args) { - if(*args!='a') // will be reloaded from all_gossips + if (*args!='a') // will be reloaded from all_gossips HandleReloadNpcGossipCommand("a"); HandleReloadNpcTrainerCommand("a"); HandleReloadNpcVendorCommand("a"); @@ -112,7 +112,7 @@ bool ChatHandler::HandleReloadAllNpcCommand(const char* args) return true; } -bool ChatHandler::HandleReloadAllQuestCommand(const char* /*args*/) +bool ChatHandler::HandleReloadAllQuestCommand(char* /*args*/) { HandleReloadQuestAreaTriggersCommand("a"); HandleReloadQuestPOICommand("a"); @@ -124,9 +124,9 @@ bool ChatHandler::HandleReloadAllQuestCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleReloadAllScriptsCommand(const char*) +bool ChatHandler::HandleReloadAllScriptsCommand(char* /*args*/) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { PSendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); @@ -145,7 +145,7 @@ bool ChatHandler::HandleReloadAllScriptsCommand(const char*) return true; } -bool ChatHandler::HandleReloadAllEventAICommand(const char*) +bool ChatHandler::HandleReloadAllEventAICommand(char* /*args*/) { HandleReloadEventAITextsCommand("a"); HandleReloadEventAISummonsCommand("a"); @@ -153,7 +153,7 @@ bool ChatHandler::HandleReloadAllEventAICommand(const char*) return true; } -bool ChatHandler::HandleReloadAllSpellCommand(const char*) +bool ChatHandler::HandleReloadAllSpellCommand(char* /*args*/) { HandleReloadSkillDiscoveryTemplateCommand("a"); HandleReloadSkillExtraItemTemplateCommand("a"); @@ -171,18 +171,18 @@ bool ChatHandler::HandleReloadAllSpellCommand(const char*) return true; } -bool ChatHandler::HandleReloadAllGossipsCommand(const char* args) +bool ChatHandler::HandleReloadAllGossipsCommand(char* args) { HandleReloadGossipMenuCommand("a"); HandleReloadGossipMenuOptionCommand("a"); - if(*args!='a') // already reload from all_scripts + if (*args!='a') // already reload from all_scripts HandleReloadGossipScriptsCommand("a"); HandleReloadNpcGossipCommand("a"); HandleReloadPointsOfInterestCommand("a"); return true; } -bool ChatHandler::HandleReloadAllItemCommand(const char*) +bool ChatHandler::HandleReloadAllItemCommand(char* /*args*/) { HandleReloadPageTextsCommand("a"); HandleReloadItemEnchantementsCommand("a"); @@ -190,7 +190,7 @@ bool ChatHandler::HandleReloadAllItemCommand(const char*) return true; } -bool ChatHandler::HandleReloadAllLocalesCommand(const char* /*args*/) +bool ChatHandler::HandleReloadAllLocalesCommand(char* /*args*/) { HandleReloadLocalesAchievementRewardCommand("a"); HandleReloadLocalesCreatureCommand("a"); @@ -204,7 +204,7 @@ bool ChatHandler::HandleReloadAllLocalesCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/) +bool ChatHandler::HandleReloadConfigCommand(char* /*args*/) { sLog.outString( "Re-Loading config settings..." ); sWorld.LoadConfigSettings(true); @@ -213,7 +213,7 @@ bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleReloadAchievementCriteriaRequirementCommand(const char*) +bool ChatHandler::HandleReloadAchievementCriteriaRequirementCommand(char* /*args*/) { sLog.outString( "Re-Loading Additional Achievement Criteria Requirements Data..." ); sAchievementMgr.LoadAchievementCriteriaRequirements(); @@ -221,7 +221,7 @@ bool ChatHandler::HandleReloadAchievementCriteriaRequirementCommand(const char*) return true; } -bool ChatHandler::HandleReloadAchievementRewardCommand(const char*) +bool ChatHandler::HandleReloadAchievementRewardCommand(char* /*args*/) { sLog.outString( "Re-Loading Achievement Reward Data..." ); sAchievementMgr.LoadRewards(); @@ -229,7 +229,7 @@ bool ChatHandler::HandleReloadAchievementRewardCommand(const char*) return true; } -bool ChatHandler::HandleReloadAreaTriggerTavernCommand(const char*) +bool ChatHandler::HandleReloadAreaTriggerTavernCommand(char* /*args*/) { sLog.outString( "Re-Loading Tavern Area Triggers..." ); sObjectMgr.LoadTavernAreaTriggers(); @@ -237,7 +237,7 @@ bool ChatHandler::HandleReloadAreaTriggerTavernCommand(const char*) return true; } -bool ChatHandler::HandleReloadAreaTriggerTeleportCommand(const char*) +bool ChatHandler::HandleReloadAreaTriggerTeleportCommand(char* /*args*/) { sLog.outString( "Re-Loading AreaTrigger teleport definitions..." ); sObjectMgr.LoadAreaTriggerTeleports(); @@ -245,14 +245,14 @@ bool ChatHandler::HandleReloadAreaTriggerTeleportCommand(const char*) return true; } -bool ChatHandler::HandleReloadCommandCommand(const char*) +bool ChatHandler::HandleReloadCommandCommand(char* /*args*/) { load_command_table = true; SendGlobalSysMessage("DB table `command` will be reloaded at next chat command use."); return true; } -bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*) +bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(char* /*args*/) { sLog.outString( "Loading Quests Relations... (`creature_questrelation`)" ); sObjectMgr.LoadCreatureQuestRelations(); @@ -260,7 +260,7 @@ bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*) return true; } -bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(const char*) +bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(char* /*args*/) { sLog.outString( "Loading Quests Relations... (`creature_involvedrelation`)" ); sObjectMgr.LoadCreatureInvolvedRelations(); @@ -268,7 +268,7 @@ bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(const char*) return true; } -bool ChatHandler::HandleReloadGossipMenuCommand(const char*) +bool ChatHandler::HandleReloadGossipMenuCommand(char* /*args*/) { sLog.outString( "Re-Loading `gossip_menu` Table!" ); sObjectMgr.LoadGossipMenu(); @@ -276,7 +276,7 @@ bool ChatHandler::HandleReloadGossipMenuCommand(const char*) return true; } -bool ChatHandler::HandleReloadGossipMenuOptionCommand(const char*) +bool ChatHandler::HandleReloadGossipMenuOptionCommand(char* /*args*/) { sLog.outString( "Re-Loading `gossip_menu_option` Table!" ); sObjectMgr.LoadGossipMenuItems(); @@ -284,27 +284,27 @@ bool ChatHandler::HandleReloadGossipMenuOptionCommand(const char*) return true; } -bool ChatHandler::HandleReloadGossipScriptsCommand(const char* arg) +bool ChatHandler::HandleReloadGossipScriptsCommand(char* args) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*args!='a') sLog.outString( "Re-Loading Scripts from `gossip_scripts`..."); sObjectMgr.LoadGossipScripts(); - if(*arg!='a') + if (*args!='a') SendGlobalSysMessage("DB table `gossip_scripts` reloaded."); return true; } -bool ChatHandler::HandleReloadGOQuestRelationsCommand(const char*) +bool ChatHandler::HandleReloadGOQuestRelationsCommand(char* /*args*/) { sLog.outString( "Loading Quests Relations... (`gameobject_questrelation`)" ); sObjectMgr.LoadGameobjectQuestRelations(); @@ -312,7 +312,7 @@ bool ChatHandler::HandleReloadGOQuestRelationsCommand(const char*) return true; } -bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(const char*) +bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(char* /*args*/) { sLog.outString( "Loading Quests Relations... (`gameobject_involvedrelation`)" ); sObjectMgr.LoadGameobjectInvolvedRelations(); @@ -320,7 +320,7 @@ bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(const char*) return true; } -bool ChatHandler::HandleReloadQuestAreaTriggersCommand(const char*) +bool ChatHandler::HandleReloadQuestAreaTriggersCommand(char* /*args*/) { sLog.outString( "Re-Loading Quest Area Triggers..." ); sObjectMgr.LoadQuestAreaTriggers(); @@ -328,7 +328,7 @@ bool ChatHandler::HandleReloadQuestAreaTriggersCommand(const char*) return true; } -bool ChatHandler::HandleReloadQuestTemplateCommand(const char*) +bool ChatHandler::HandleReloadQuestTemplateCommand(char* /*args*/) { sLog.outString( "Re-Loading Quest Templates..." ); sObjectMgr.LoadQuests(); @@ -341,7 +341,7 @@ bool ChatHandler::HandleReloadQuestTemplateCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesCreatureCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesCreatureCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`creature_loot_template`)" ); LoadLootTemplates_Creature(); @@ -350,7 +350,7 @@ bool ChatHandler::HandleReloadLootTemplatesCreatureCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesDisenchantCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesDisenchantCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`disenchant_loot_template`)" ); LoadLootTemplates_Disenchant(); @@ -359,7 +359,7 @@ bool ChatHandler::HandleReloadLootTemplatesDisenchantCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesFishingCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesFishingCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`fishing_loot_template`)" ); LoadLootTemplates_Fishing(); @@ -368,7 +368,7 @@ bool ChatHandler::HandleReloadLootTemplatesFishingCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesGameobjectCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesGameobjectCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`gameobject_loot_template`)" ); LoadLootTemplates_Gameobject(); @@ -377,7 +377,7 @@ bool ChatHandler::HandleReloadLootTemplatesGameobjectCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesItemCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesItemCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`item_loot_template`)" ); LoadLootTemplates_Item(); @@ -386,7 +386,7 @@ bool ChatHandler::HandleReloadLootTemplatesItemCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesMillingCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesMillingCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`milling_loot_template`)" ); LoadLootTemplates_Milling(); @@ -395,7 +395,7 @@ bool ChatHandler::HandleReloadLootTemplatesMillingCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesPickpocketingCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesPickpocketingCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`pickpocketing_loot_template`)" ); LoadLootTemplates_Pickpocketing(); @@ -404,7 +404,7 @@ bool ChatHandler::HandleReloadLootTemplatesPickpocketingCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesProspectingCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesProspectingCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`prospecting_loot_template`)" ); LoadLootTemplates_Prospecting(); @@ -413,7 +413,7 @@ bool ChatHandler::HandleReloadLootTemplatesProspectingCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesMailCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesMailCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`mail_loot_template`)" ); LoadLootTemplates_Mail(); @@ -422,7 +422,7 @@ bool ChatHandler::HandleReloadLootTemplatesMailCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesReferenceCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesReferenceCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`reference_loot_template`)" ); LoadLootTemplates_Reference(); @@ -430,7 +430,7 @@ bool ChatHandler::HandleReloadLootTemplatesReferenceCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesSkinningCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesSkinningCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`skinning_loot_template`)" ); LoadLootTemplates_Skinning(); @@ -439,7 +439,7 @@ bool ChatHandler::HandleReloadLootTemplatesSkinningCommand(const char*) return true; } -bool ChatHandler::HandleReloadLootTemplatesSpellCommand(const char*) +bool ChatHandler::HandleReloadLootTemplatesSpellCommand(char* /*args*/) { sLog.outString( "Re-Loading Loot Tables... (`spell_loot_template`)" ); LoadLootTemplates_Spell(); @@ -448,7 +448,7 @@ bool ChatHandler::HandleReloadLootTemplatesSpellCommand(const char*) return true; } -bool ChatHandler::HandleReloadMangosStringCommand(const char*) +bool ChatHandler::HandleReloadMangosStringCommand(char* /*args*/) { sLog.outString( "Re-Loading mangos_string Table!" ); sObjectMgr.LoadMangosStrings(); @@ -456,7 +456,7 @@ bool ChatHandler::HandleReloadMangosStringCommand(const char*) return true; } -bool ChatHandler::HandleReloadNpcGossipCommand(const char*) +bool ChatHandler::HandleReloadNpcGossipCommand(char* /*args*/) { sLog.outString( "Re-Loading `npc_gossip` Table!" ); sObjectMgr.LoadNpcTextId(); @@ -464,7 +464,7 @@ bool ChatHandler::HandleReloadNpcGossipCommand(const char*) return true; } -bool ChatHandler::HandleReloadNpcTrainerCommand(const char*) +bool ChatHandler::HandleReloadNpcTrainerCommand(char* /*args*/) { sLog.outString( "Re-Loading `npc_trainer` Table!" ); sObjectMgr.LoadTrainerSpell(); @@ -472,7 +472,7 @@ bool ChatHandler::HandleReloadNpcTrainerCommand(const char*) return true; } -bool ChatHandler::HandleReloadNpcVendorCommand(const char*) +bool ChatHandler::HandleReloadNpcVendorCommand(char* /*args*/) { sLog.outString( "Re-Loading `npc_vendor` Table!" ); sObjectMgr.LoadVendors(); @@ -480,7 +480,7 @@ bool ChatHandler::HandleReloadNpcVendorCommand(const char*) return true; } -bool ChatHandler::HandleReloadPointsOfInterestCommand(const char*) +bool ChatHandler::HandleReloadPointsOfInterestCommand(char* /*args*/) { sLog.outString( "Re-Loading `points_of_interest` Table!" ); sObjectMgr.LoadPointsOfInterest(); @@ -488,7 +488,7 @@ bool ChatHandler::HandleReloadPointsOfInterestCommand(const char*) return true; } -bool ChatHandler::HandleReloadQuestPOICommand(const char*) +bool ChatHandler::HandleReloadQuestPOICommand(char* /*args*/) { sLog.outString( "Re-Loading `quest_poi` and `quest_poi_points` Tables!" ); sObjectMgr.LoadQuestPOI(); @@ -496,7 +496,7 @@ bool ChatHandler::HandleReloadQuestPOICommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellClickSpellsCommand(const char*) +bool ChatHandler::HandleReloadSpellClickSpellsCommand(char* /*args*/) { sLog.outString( "Re-Loading `npc_spellclick_spells` Table!" ); sObjectMgr.LoadNPCSpellClickSpells(); @@ -504,7 +504,7 @@ bool ChatHandler::HandleReloadSpellClickSpellsCommand(const char*) return true; } -bool ChatHandler::HandleReloadReservedNameCommand(const char*) +bool ChatHandler::HandleReloadReservedNameCommand(char* /*args*/) { sLog.outString( "Loading ReservedNames... (`reserved_name`)" ); sObjectMgr.LoadReservedPlayersNames(); @@ -512,7 +512,7 @@ bool ChatHandler::HandleReloadReservedNameCommand(const char*) return true; } -bool ChatHandler::HandleReloadReputationRewardRateCommand(const char*) +bool ChatHandler::HandleReloadReputationRewardRateCommand(char* /*args*/) { sLog.outString( "Re-Loading `reputation_reward_rate` Table!" ); sObjectMgr.LoadReputationRewardRate(); @@ -520,7 +520,7 @@ bool ChatHandler::HandleReloadReputationRewardRateCommand(const char*) return true; } -bool ChatHandler::HandleReloadReputationSpilloverTemplateCommand(const char*) +bool ChatHandler::HandleReloadReputationSpilloverTemplateCommand(char* /*args*/) { sLog.outString( "Re-Loading `reputation_spillover_template` Table!" ); sObjectMgr.LoadReputationSpilloverTemplate(); @@ -528,7 +528,7 @@ bool ChatHandler::HandleReloadReputationSpilloverTemplateCommand(const char*) return true; } -bool ChatHandler::HandleReloadSkillDiscoveryTemplateCommand(const char* /*args*/) +bool ChatHandler::HandleReloadSkillDiscoveryTemplateCommand(char* /*args*/) { sLog.outString( "Re-Loading Skill Discovery Table..." ); LoadSkillDiscoveryTable(); @@ -536,7 +536,7 @@ bool ChatHandler::HandleReloadSkillDiscoveryTemplateCommand(const char* /*args*/ return true; } -bool ChatHandler::HandleReloadSkillExtraItemTemplateCommand(const char* /*args*/) +bool ChatHandler::HandleReloadSkillExtraItemTemplateCommand(char* /*args*/) { sLog.outString( "Re-Loading Skill Extra Item Table..." ); LoadSkillExtraItemTable(); @@ -544,7 +544,7 @@ bool ChatHandler::HandleReloadSkillExtraItemTemplateCommand(const char* /*args*/ return true; } -bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(const char* /*args*/) +bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(char* /*args*/) { sLog.outString( "Re-Loading Skill Fishing base level requirements..." ); sObjectMgr.LoadFishingBaseSkillLevel(); @@ -552,7 +552,7 @@ bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleReloadSpellAreaCommand(const char*) +bool ChatHandler::HandleReloadSpellAreaCommand(char* /*args*/) { sLog.outString( "Re-Loading SpellArea Data..." ); sSpellMgr.LoadSpellAreas(); @@ -560,7 +560,7 @@ bool ChatHandler::HandleReloadSpellAreaCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellChainCommand(const char*) +bool ChatHandler::HandleReloadSpellChainCommand(char* /*args*/) { sLog.outString( "Re-Loading Spell Chain Data... " ); sSpellMgr.LoadSpellChains(); @@ -568,7 +568,7 @@ bool ChatHandler::HandleReloadSpellChainCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellElixirCommand(const char*) +bool ChatHandler::HandleReloadSpellElixirCommand(char* /*args*/) { sLog.outString( "Re-Loading Spell Elixir types..." ); sSpellMgr.LoadSpellElixirs(); @@ -576,7 +576,7 @@ bool ChatHandler::HandleReloadSpellElixirCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellLearnSpellCommand(const char*) +bool ChatHandler::HandleReloadSpellLearnSpellCommand(char* /*args*/) { sLog.outString( "Re-Loading Spell Learn Spells..." ); sSpellMgr.LoadSpellLearnSpells(); @@ -584,7 +584,7 @@ bool ChatHandler::HandleReloadSpellLearnSpellCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellProcEventCommand(const char*) +bool ChatHandler::HandleReloadSpellProcEventCommand(char* /*args*/) { sLog.outString( "Re-Loading Spell Proc Event conditions..." ); sSpellMgr.LoadSpellProcEvents(); @@ -592,7 +592,7 @@ bool ChatHandler::HandleReloadSpellProcEventCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellBonusesCommand(const char*) +bool ChatHandler::HandleReloadSpellBonusesCommand(char* /*args*/) { sLog.outString( "Re-Loading Spell Bonus Data..." ); sSpellMgr.LoadSpellBonuses(); @@ -600,7 +600,7 @@ bool ChatHandler::HandleReloadSpellBonusesCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellProcItemEnchantCommand(const char*) +bool ChatHandler::HandleReloadSpellProcItemEnchantCommand(char* /*args*/) { sLog.outString( "Re-Loading Spell Proc Item Enchant..." ); sSpellMgr.LoadSpellProcItemEnchant(); @@ -608,7 +608,7 @@ bool ChatHandler::HandleReloadSpellProcItemEnchantCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellScriptTargetCommand(const char*) +bool ChatHandler::HandleReloadSpellScriptTargetCommand(char* /*args*/) { sLog.outString( "Re-Loading SpellsScriptTarget..." ); sSpellMgr.LoadSpellScriptTarget(); @@ -616,7 +616,7 @@ bool ChatHandler::HandleReloadSpellScriptTargetCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellTargetPositionCommand(const char*) +bool ChatHandler::HandleReloadSpellTargetPositionCommand(char* /*args*/) { sLog.outString( "Re-Loading Spell target coordinates..." ); sSpellMgr.LoadSpellTargetPositions(); @@ -624,7 +624,7 @@ bool ChatHandler::HandleReloadSpellTargetPositionCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellThreatsCommand(const char*) +bool ChatHandler::HandleReloadSpellThreatsCommand(char* /*args*/) { sLog.outString( "Re-Loading Aggro Spells Definitions..."); sSpellMgr.LoadSpellThreats(); @@ -632,7 +632,7 @@ bool ChatHandler::HandleReloadSpellThreatsCommand(const char*) return true; } -bool ChatHandler::HandleReloadSpellPetAurasCommand(const char*) +bool ChatHandler::HandleReloadSpellPetAurasCommand(char* /*args*/) { sLog.outString( "Re-Loading Spell pet auras..."); sSpellMgr.LoadSpellPetAuras(); @@ -640,7 +640,7 @@ bool ChatHandler::HandleReloadSpellPetAurasCommand(const char*) return true; } -bool ChatHandler::HandleReloadPageTextsCommand(const char*) +bool ChatHandler::HandleReloadPageTextsCommand(char* /*args*/) { sLog.outString( "Re-Loading Page Texts..." ); sObjectMgr.LoadPageTexts(); @@ -648,7 +648,7 @@ bool ChatHandler::HandleReloadPageTextsCommand(const char*) return true; } -bool ChatHandler::HandleReloadItemEnchantementsCommand(const char*) +bool ChatHandler::HandleReloadItemEnchantementsCommand(char* /*args*/) { sLog.outString( "Re-Loading Item Random Enchantments Table..." ); LoadRandomEnchantmentsTable(); @@ -656,7 +656,7 @@ bool ChatHandler::HandleReloadItemEnchantementsCommand(const char*) return true; } -bool ChatHandler::HandleReloadItemRequiredTragetCommand(const char*) +bool ChatHandler::HandleReloadItemRequiredTragetCommand(char* /*args*/) { sLog.outString( "Re-Loading Item Required Targets Table..." ); sObjectMgr.LoadItemRequiredTarget(); @@ -664,7 +664,7 @@ bool ChatHandler::HandleReloadItemRequiredTragetCommand(const char*) return true; } -bool ChatHandler::HandleReloadBattleEventCommand(const char*) +bool ChatHandler::HandleReloadBattleEventCommand(char* /*args*/) { sLog.outString( "Re-Loading BattleGround Eventindexes..." ); sBattleGroundMgr.LoadBattleEventIndexes(); @@ -672,27 +672,27 @@ bool ChatHandler::HandleReloadBattleEventCommand(const char*) return true; } -bool ChatHandler::HandleReloadGameObjectScriptsCommand(const char* arg) +bool ChatHandler::HandleReloadGameObjectScriptsCommand(char* args) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*args!='a') sLog.outString( "Re-Loading Scripts from `gameobject_scripts`..."); sObjectMgr.LoadGameObjectScripts(); - if(*arg!='a') + if (*args!='a') SendGlobalSysMessage("DB table `gameobject_scripts` reloaded."); return true; } -bool ChatHandler::HandleReloadEventScriptsCommand(const char* arg) +bool ChatHandler::HandleReloadEventScriptsCommand(char* args) { if(sWorld.IsScriptScheduled()) { @@ -701,18 +701,18 @@ bool ChatHandler::HandleReloadEventScriptsCommand(const char* arg) return false; } - if(*arg!='a') + if (*args!='a') sLog.outString( "Re-Loading Scripts from `event_scripts`..."); sObjectMgr.LoadEventScripts(); - if(*arg!='a') + if (*args!='a') SendGlobalSysMessage("DB table `event_scripts` reloaded."); return true; } -bool ChatHandler::HandleReloadEventAITextsCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadEventAITextsCommand(char* /*args*/) { sLog.outString( "Re-Loading Texts from `creature_ai_texts`..."); @@ -721,7 +721,7 @@ bool ChatHandler::HandleReloadEventAITextsCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadEventAISummonsCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadEventAISummonsCommand(char* /*args*/) { sLog.outString( "Re-Loading Summons from `creature_ai_summons`..."); sEventAIMgr.LoadCreatureEventAI_Summons(true); @@ -729,7 +729,7 @@ bool ChatHandler::HandleReloadEventAISummonsCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadEventAIScriptsCommand(char* /*args*/) { sLog.outString( "Re-Loading Scripts from `creature_ai_scripts`..."); sEventAIMgr.LoadCreatureEventAI_Scripts(); @@ -737,67 +737,67 @@ bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadQuestEndScriptsCommand(const char* arg) +bool ChatHandler::HandleReloadQuestEndScriptsCommand(char* args) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*args != 'a') sLog.outString( "Re-Loading Scripts from `quest_end_scripts`..."); sObjectMgr.LoadQuestEndScripts(); - if(*arg!='a') + if (*args != 'a') SendGlobalSysMessage("DB table `quest_end_scripts` reloaded."); return true; } -bool ChatHandler::HandleReloadQuestStartScriptsCommand(const char* arg) +bool ChatHandler::HandleReloadQuestStartScriptsCommand(char* args) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*args != 'a') sLog.outString( "Re-Loading Scripts from `quest_start_scripts`..."); sObjectMgr.LoadQuestStartScripts(); - if(*arg!='a') + if (*args != 'a') SendGlobalSysMessage("DB table `quest_start_scripts` reloaded."); return true; } -bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg) +bool ChatHandler::HandleReloadSpellScriptsCommand(char* args) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*args != 'a') sLog.outString( "Re-Loading Scripts from `spell_scripts`..."); sObjectMgr.LoadSpellScripts(); - if(*arg!='a') + if (*args != 'a') SendGlobalSysMessage("DB table `spell_scripts` reloaded."); return true; } -bool ChatHandler::HandleReloadDbScriptStringCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadDbScriptStringCommand(char* /*args*/) { sLog.outString( "Re-Loading Script strings from `db_script_string`..."); sObjectMgr.LoadDbScriptStrings(); @@ -805,7 +805,7 @@ bool ChatHandler::HandleReloadDbScriptStringCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadGameGraveyardZoneCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadGameGraveyardZoneCommand(char* /*args*/) { sLog.outString( "Re-Loading Graveyard-zone links..."); @@ -816,7 +816,7 @@ bool ChatHandler::HandleReloadGameGraveyardZoneCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadGameTeleCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadGameTeleCommand(char* /*args*/) { sLog.outString( "Re-Loading Game Tele coordinates..."); @@ -827,7 +827,7 @@ bool ChatHandler::HandleReloadGameTeleCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(const char*) +bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(char* /*args*/) { sLog.outString( "Re-Loading Locales Achievement Reward Data..." ); sAchievementMgr.LoadRewardLocales(); @@ -835,7 +835,7 @@ bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(const char*) return true; } -bool ChatHandler::HandleReloadLocalesCreatureCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadLocalesCreatureCommand(char* /*args*/) { sLog.outString( "Re-Loading Locales Creature ..."); sObjectMgr.LoadCreatureLocales(); @@ -843,7 +843,7 @@ bool ChatHandler::HandleReloadLocalesCreatureCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadLocalesGameobjectCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadLocalesGameobjectCommand(char* /*args*/) { sLog.outString( "Re-Loading Locales Gameobject ... "); sObjectMgr.LoadGameObjectLocales(); @@ -851,7 +851,7 @@ bool ChatHandler::HandleReloadLocalesGameobjectCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadLocalesGossipMenuOptionCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadLocalesGossipMenuOptionCommand(char* /*args*/) { sLog.outString( "Re-Loading Locales Gossip Menu Option ... "); sObjectMgr.LoadGossipMenuItemsLocales(); @@ -859,7 +859,7 @@ bool ChatHandler::HandleReloadLocalesGossipMenuOptionCommand(const char* /*arg*/ return true; } -bool ChatHandler::HandleReloadLocalesItemCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadLocalesItemCommand(char* /*args*/) { sLog.outString( "Re-Loading Locales Item ... "); sObjectMgr.LoadItemLocales(); @@ -867,7 +867,7 @@ bool ChatHandler::HandleReloadLocalesItemCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadLocalesNpcTextCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadLocalesNpcTextCommand(char* /*args*/) { sLog.outString( "Re-Loading Locales NPC Text ... "); sObjectMgr.LoadNpcTextLocales(); @@ -875,7 +875,7 @@ bool ChatHandler::HandleReloadLocalesNpcTextCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadLocalesPageTextCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadLocalesPageTextCommand(char* /*args*/) { sLog.outString( "Re-Loading Locales Page Text ... "); sObjectMgr.LoadPageTextLocales(); @@ -883,7 +883,7 @@ bool ChatHandler::HandleReloadLocalesPageTextCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(char* /*args*/) { sLog.outString( "Re-Loading Locales Points Of Interest ... "); sObjectMgr.LoadPointOfInterestLocales(); @@ -891,7 +891,7 @@ bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(const char* /*arg*/ return true; } -bool ChatHandler::HandleReloadLocalesQuestCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadLocalesQuestCommand(char* /*args*/) { sLog.outString( "Re-Loading Locales Quest ... "); sObjectMgr.LoadQuestLocales(); @@ -899,7 +899,7 @@ bool ChatHandler::HandleReloadLocalesQuestCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleReloadMailLevelRewardCommand(const char* /*arg*/) +bool ChatHandler::HandleReloadMailLevelRewardCommand(char* /*args*/) { sLog.outString( "Re-Loading Player level dependent mail rewards..." ); sObjectMgr.LoadMailLevelRewards(); @@ -907,24 +907,25 @@ bool ChatHandler::HandleReloadMailLevelRewardCommand(const char* /*arg*/) return true; } -bool ChatHandler::HandleLoadScriptsCommand(const char* args) +bool ChatHandler::HandleLoadScriptsCommand(char* args) { - if(!LoadScriptingModule(args)) return true; + if (!LoadScriptingModule(args)) + return true; sWorld.SendWorldText(LANG_SCRIPTS_RELOADED); return true; } -bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args) +bool ChatHandler::HandleAccountSetGmLevelCommand(char* args) { char* arg1; char* arg2; - extractOptFirstArg((char*)args, &arg1, &arg2); + extractOptFirstArg(args, &arg1, &arg2); std::string targetAccountName; Player* targetPlayer = NULL; - uint32 targetAccountId = extractAccountId(arg1,&targetAccountName,&targetPlayer); + uint32 targetAccountId = extractAccountId(arg1, &targetAccountName, &targetPlayer); if (!targetAccountId) return false; @@ -967,14 +968,14 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args) } /// Set password for account -bool ChatHandler::HandleAccountSetPasswordCommand(const char* args) +bool ChatHandler::HandleAccountSetPasswordCommand(char* args) { if(!*args) return false; ///- Get the command line arguments std::string account_name; - uint32 targetAccountId = extractAccountId((char*)args, &account_name); + uint32 targetAccountId = extractAccountId(args, &account_name); if (!targetAccountId) return false; @@ -1019,7 +1020,7 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char* args) return true; } -bool ChatHandler::HandleMaxSkillCommand(const char* /*args*/) +bool ChatHandler::HandleMaxSkillCommand(char* /*args*/) { Player* SelectedPlayer = getSelectedPlayer(); if(!SelectedPlayer) @@ -1034,16 +1035,16 @@ bool ChatHandler::HandleMaxSkillCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleSetSkillCommand(const char* args) +bool ChatHandler::HandleSetSkillCommand(char* args) { // number or [name] Shift-click form |color|Hskill:skill_id|h[name]|h|r - char* skill_p = extractKeyFromLink((char*)args,"Hskill"); - if(!skill_p) + char* skill_p = extractKeyFromLink(args, "Hskill"); + if (!skill_p) return false; char *level_p = strtok (NULL, " "); - if( !level_p) + if (!level_p) return false; char *max_p = strtok (NULL, " "); @@ -1094,14 +1095,14 @@ bool ChatHandler::HandleSetSkillCommand(const char* args) return true; } -bool ChatHandler::HandleUnLearnCommand(const char* args) +bool ChatHandler::HandleUnLearnCommand(char* args) { if (!*args) return false; // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r - uint32 spell_id = extractSpellIdFromLink((char*)args); - if(!spell_id) + uint32 spell_id = extractSpellIdFromLink(args); + if (!spell_id) return false; char const* allStr = strtok(NULL," "); @@ -1129,7 +1130,7 @@ bool ChatHandler::HandleUnLearnCommand(const char* args) return true; } -bool ChatHandler::HandleCooldownCommand(const char* args) +bool ChatHandler::HandleCooldownCommand(char* args) { Player* target = getSelectedPlayer(); if(!target) @@ -1149,11 +1150,11 @@ bool ChatHandler::HandleCooldownCommand(const char* args) else { // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form - uint32 spell_id = extractSpellIdFromLink((char*)args); - if(!spell_id) + uint32 spell_id = extractSpellIdFromLink(args); + if (!spell_id) return false; - if(!sSpellStore.LookupEntry(spell_id)) + if (!sSpellStore.LookupEntry(spell_id)) { PSendSysMessage(LANG_UNKNOWN_SPELL, target==m_session->GetPlayer() ? GetMangosString(LANG_YOU) : tNameLink.c_str()); SetSentErrorMessage(true); @@ -1166,7 +1167,7 @@ bool ChatHandler::HandleCooldownCommand(const char* args) return true; } -bool ChatHandler::HandleLearnAllCommand(const char* /*args*/) +bool ChatHandler::HandleLearnAllCommand(char* /*args*/) { static const char *allSpellList[] = { @@ -1795,7 +1796,7 @@ bool ChatHandler::HandleLearnAllCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleLearnAllGMCommand(const char* /*args*/) +bool ChatHandler::HandleLearnAllGMCommand(char* /*args*/) { static const char *gmSpellList[] = { @@ -1834,14 +1835,14 @@ bool ChatHandler::HandleLearnAllGMCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleLearnAllMyClassCommand(const char* /*args*/) +bool ChatHandler::HandleLearnAllMyClassCommand(char* /*args*/) { HandleLearnAllMySpellsCommand(""); HandleLearnAllMyTalentsCommand(""); return true; } -bool ChatHandler::HandleLearnAllMySpellsCommand(const char* /*args*/) +bool ChatHandler::HandleLearnAllMySpellsCommand(char* /*args*/) { ChrClassesEntry const* clsEntry = sChrClassesStore.LookupEntry(m_session->GetPlayer()->getClass()); if(!clsEntry) @@ -1886,7 +1887,7 @@ bool ChatHandler::HandleLearnAllMySpellsCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/) +bool ChatHandler::HandleLearnAllMyTalentsCommand(char* /*args*/) { Player* player = m_session->GetPlayer(); uint32 classMask = player->getClassMask(); @@ -1933,7 +1934,7 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) +bool ChatHandler::HandleLearnAllMyPetTalentsCommand(char* /*args*/) { Player* player = m_session->GetPlayer(); @@ -2011,7 +2012,7 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleLearnAllLangCommand(const char* /*args*/) +bool ChatHandler::HandleLearnAllLangCommand(char* /*args*/) { // skipping UNIVERSAL language (0) for(int i = 1; i < LANGUAGES_COUNT; ++i) @@ -2021,10 +2022,10 @@ bool ChatHandler::HandleLearnAllLangCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleLearnAllDefaultCommand(const char* args) +bool ChatHandler::HandleLearnAllDefaultCommand(char* args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget(args, &target)) return false; target->learnDefaultSpells(); @@ -2034,7 +2035,7 @@ bool ChatHandler::HandleLearnAllDefaultCommand(const char* args) return true; } -bool ChatHandler::HandleLearnCommand(const char* args) +bool ChatHandler::HandleLearnCommand(char* args) { Player* targetPlayer = getSelectedPlayer(); @@ -2046,15 +2047,15 @@ bool ChatHandler::HandleLearnCommand(const char* args) } // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form - uint32 spell = extractSpellIdFromLink((char*)args); - if(!spell || !sSpellStore.LookupEntry(spell)) + uint32 spell = extractSpellIdFromLink(args); + if (!spell || !sSpellStore.LookupEntry(spell)) return false; char const* allStr = strtok(NULL," "); bool allRanks = allStr ? (strncmp(allStr, "all", strlen(allStr)) == 0) : false; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell); - if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) { PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell); SetSentErrorMessage(true); @@ -2063,7 +2064,7 @@ bool ChatHandler::HandleLearnCommand(const char* args) if (!allRanks && targetPlayer->HasSpell(spell)) { - if(targetPlayer == m_session->GetPlayer()) + if (targetPlayer == m_session->GetPlayer()) SendSysMessage(LANG_YOU_KNOWN_SPELL); else PSendSysMessage(LANG_TARGET_KNOWN_SPELL,GetNameLink(targetPlayer).c_str()); @@ -2071,19 +2072,19 @@ bool ChatHandler::HandleLearnCommand(const char* args) return false; } - if(allRanks) + if (allRanks) targetPlayer->learnSpellHighRank(spell); else targetPlayer->learnSpell(spell, false); uint32 first_spell = sSpellMgr.GetFirstSpellInChain(spell); - if(GetTalentSpellCost(first_spell)) + if (GetTalentSpellCost(first_spell)) targetPlayer->SendTalentsInfoData(false); return true; } -bool ChatHandler::HandleAddItemCommand(const char* args) +bool ChatHandler::HandleAddItemCommand(char* args) { if (!*args) return false; @@ -2092,9 +2093,9 @@ bool ChatHandler::HandleAddItemCommand(const char* args) if(args[0]=='[') // [name] manual form { - char* citemName = strtok((char*)args, "]"); + char* citemName = strtok(args, "]"); - if(citemName && citemName[0]) + if (citemName && citemName[0]) { std::string itemName = citemName+1; WorldDatabase.escape_string(itemName); @@ -2113,7 +2114,7 @@ bool ChatHandler::HandleAddItemCommand(const char* args) } else // item_id or [name] Shift-click form |color|Hitem:item_id:0:0:0|h[name]|h|r { - char* cId = extractKeyFromLink((char*)args,"Hitem"); + char* cId = extractKeyFromLink(args, "Hitem"); if(!cId) return false; itemId = atol(cId); @@ -2189,12 +2190,12 @@ bool ChatHandler::HandleAddItemCommand(const char* args) return true; } -bool ChatHandler::HandleAddItemSetCommand(const char* args) +bool ChatHandler::HandleAddItemSetCommand(char* args) { if (!*args) return false; - char* cId = extractKeyFromLink((char*)args,"Hitemset"); // number or [name] Shift-click form |color|Hitemset:itemset_id|h[name]|h|r + char* cId = extractKeyFromLink(args, "Hitemset"); // number or [name] Shift-click form |color|Hitemset:itemset_id|h[name]|h|r if (!cId) return false; @@ -2258,12 +2259,12 @@ bool ChatHandler::HandleAddItemSetCommand(const char* args) return true; } -bool ChatHandler::HandleListItemCommand(const char* args) +bool ChatHandler::HandleListItemCommand(char* args) { - if(!*args) + if (!*args) return false; - char* cId = extractKeyFromLink((char*)args,"Hitem"); + char* cId = extractKeyFromLink(args, "Hitem"); if(!cId) return false; @@ -2482,13 +2483,13 @@ bool ChatHandler::HandleListItemCommand(const char* args) return true; } -bool ChatHandler::HandleListObjectCommand(const char* args) +bool ChatHandler::HandleListObjectCommand(char* args) { if (!*args) return false; // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args, "Hgameobject_entry"); + char* cId = extractKeyFromLink(args, "Hgameobject_entry"); if (!cId) return false; @@ -2558,13 +2559,13 @@ bool ChatHandler::HandleListObjectCommand(const char* args) return true; } -bool ChatHandler::HandleListCreatureCommand(const char* args) +bool ChatHandler::HandleListCreatureCommand(char* args) { if (!*args) return false; // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args, "Hcreature_entry"); + char* cId = extractKeyFromLink(args, "Hcreature_entry"); if (!cId) return false; @@ -2663,7 +2664,7 @@ void ChatHandler::ShowItemListHelper( uint32 itemId, int loc_idx, Player* target PSendSysMessage(LANG_ITEM_LIST_CONSOLE, itemId, name.c_str(), usableStr); } -bool ChatHandler::HandleLookupItemCommand(const char* args) +bool ChatHandler::HandleLookupItemCommand(char* args) { if(!*args) return false; @@ -2725,7 +2726,7 @@ bool ChatHandler::HandleLookupItemCommand(const char* args) return true; } -bool ChatHandler::HandleLookupItemSetCommand(const char* args) +bool ChatHandler::HandleLookupItemSetCommand(char* args) { if(!*args) return false; @@ -2785,7 +2786,7 @@ bool ChatHandler::HandleLookupItemSetCommand(const char* args) return true; } -bool ChatHandler::HandleLookupSkillCommand(const char* args) +bool ChatHandler::HandleLookupSkillCommand(char* args) { if(!*args) return false; @@ -2910,7 +2911,7 @@ void ChatHandler::ShowSpellListHelper(Player* target, SpellEntry const* spellInf SendSysMessage(ss.str().c_str()); } -bool ChatHandler::HandleLookupSpellCommand(const char* args) +bool ChatHandler::HandleLookupSpellCommand(char* args) { if(!*args) return false; @@ -3007,7 +3008,7 @@ void ChatHandler::ShowQuestListHelper( uint32 questId, int32 loc_idx, Player* ta PSendSysMessage(LANG_QUEST_LIST_CONSOLE, qinfo->GetQuestId(), title.c_str(), statusStr); } -bool ChatHandler::HandleLookupQuestCommand(const char* args) +bool ChatHandler::HandleLookupQuestCommand(char* args) { if(!*args) return false; @@ -3068,7 +3069,7 @@ bool ChatHandler::HandleLookupQuestCommand(const char* args) return true; } -bool ChatHandler::HandleLookupCreatureCommand(const char* args) +bool ChatHandler::HandleLookupCreatureCommand(char* args) { if (!*args) return false; @@ -3133,7 +3134,7 @@ bool ChatHandler::HandleLookupCreatureCommand(const char* args) return true; } -bool ChatHandler::HandleLookupObjectCommand(const char* args) +bool ChatHandler::HandleLookupObjectCommand(char* args) { if(!*args) return false; @@ -3198,7 +3199,7 @@ bool ChatHandler::HandleLookupObjectCommand(const char* args) return true; } -bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) +bool ChatHandler::HandleLookupTaxiNodeCommand(char * args) { if(!*args) return false; @@ -3268,17 +3269,17 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) * and then the name of the guild. * */ -bool ChatHandler::HandleGuildCreateCommand(const char* args) +bool ChatHandler::HandleGuildCreateCommand(char* args) { if(!*args) return false; // if not guild name only (in "") then player name Player* target; - if(!extractPlayerTarget(*args!='"' ? (char*)args : NULL, &target)) + if(!extractPlayerTarget(*args!='"' ? args : NULL, &target)) return false; - char* tailStr = *args!='"' ? strtok(NULL, "") : (char*)args; + char* tailStr = *args!='"' ? strtok(NULL, "") : args; if(!tailStr) return false; @@ -3307,17 +3308,17 @@ bool ChatHandler::HandleGuildCreateCommand(const char* args) return true; } -bool ChatHandler::HandleGuildInviteCommand(const char *args) +bool ChatHandler::HandleGuildInviteCommand(char *args) { - if(!*args) + if (!*args) return false; // if not guild name only (in "") then player name uint64 target_guid; - if(!extractPlayerTarget(*args!='"' ? (char*)args : NULL, NULL, &target_guid)) + if(!extractPlayerTarget(*args!='"' ? args : NULL, NULL, &target_guid)) return false; - char* tailStr = *args!='"' ? strtok(NULL, "") : (char*)args; + char* tailStr = *args!='"' ? strtok(NULL, "") : args; if(!tailStr) return false; @@ -3337,11 +3338,11 @@ bool ChatHandler::HandleGuildInviteCommand(const char *args) return true; } -bool ChatHandler::HandleGuildUninviteCommand(const char *args) +bool ChatHandler::HandleGuildUninviteCommand(char *args) { Player* target; uint64 target_guid; - if(!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget(args, &target, &target_guid)) return false; uint32 glId = target ? target->GetGuildId () : Player::GetGuildIdFromDB (target_guid); @@ -3356,18 +3357,18 @@ bool ChatHandler::HandleGuildUninviteCommand(const char *args) return true; } -bool ChatHandler::HandleGuildRankCommand(const char *args) +bool ChatHandler::HandleGuildRankCommand(char *args) { char* nameStr; char* rankStr; - extractOptFirstArg((char*)args,&nameStr,&rankStr); + extractOptFirstArg(args, &nameStr, &rankStr); if(!rankStr) return false; Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; uint32 glId = target ? target->GetGuildId () : Player::GetGuildIdFromDB (target_guid); @@ -3386,12 +3387,12 @@ bool ChatHandler::HandleGuildRankCommand(const char *args) return true; } -bool ChatHandler::HandleGuildDeleteCommand(const char* args) +bool ChatHandler::HandleGuildDeleteCommand(char* args) { if (!*args) return false; - char* guildStr = extractQuotedArg((char*)args); + char* guildStr = extractQuotedArg(args); if(!guildStr) return false; @@ -3406,14 +3407,13 @@ bool ChatHandler::HandleGuildDeleteCommand(const char* args) return true; } -bool ChatHandler::HandleGetDistanceCommand(const char* args) +bool ChatHandler::HandleGetDistanceCommand(char* args) { WorldObject* obj = NULL; if (*args) { - uint64 guid = extractGuidFromLink((char*)args); - if(guid) + if (uint64 guid = extractGuidFromLink(args)) obj = (WorldObject*)m_session->GetPlayer()->GetObjectByTypeMask(guid, TYPEMASK_CREATURE_OR_GAMEOBJECT); if(!obj) @@ -3435,12 +3435,12 @@ bool ChatHandler::HandleGetDistanceCommand(const char* args) } } - PSendSysMessage(LANG_DISTANCE, m_session->GetPlayer()->GetDistance(obj),m_session->GetPlayer()->GetDistance2d(obj)); + PSendSysMessage(LANG_DISTANCE, m_session->GetPlayer()->GetDistance(obj), m_session->GetPlayer()->GetDistance2d(obj)); return true; } -bool ChatHandler::HandleDieCommand(const char* /*args*/) +bool ChatHandler::HandleDieCommand(char* /*args*/) { Unit* target = getSelectedUnit(); @@ -3465,7 +3465,7 @@ bool ChatHandler::HandleDieCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleDamageCommand(const char * args) +bool ChatHandler::HandleDamageCommand(char* args) { if (!*args) return false; @@ -3482,17 +3482,17 @@ bool ChatHandler::HandleDamageCommand(const char * args) if (!target->isAlive()) return true; - char* damageStr = strtok((char*)args, " "); + char* damageStr = strtok(args, " "); if (!damageStr) return false; - int32 damage_int = atoi((char*)damageStr); + int32 damage_int = atoi(damageStr); if(damage_int <=0) return true; uint32 damage = damage_int; - char* schoolStr = strtok((char*)NULL, " "); + char* schoolStr = strtok(NULL, " "); // flat melee damage without resistence/etc reduction if (!schoolStr) @@ -3503,7 +3503,7 @@ bool ChatHandler::HandleDamageCommand(const char * args) return true; } - uint32 school = schoolStr ? atoi((char*)schoolStr) : SPELL_SCHOOL_NORMAL; + uint32 school = schoolStr ? atoi(schoolStr) : SPELL_SCHOOL_NORMAL; if(school >= MAX_SPELL_SCHOOL) return false; @@ -3512,7 +3512,7 @@ bool ChatHandler::HandleDamageCommand(const char * args) if ( schoolmask & SPELL_SCHOOL_MASK_NORMAL ) damage = m_session->GetPlayer()->CalcArmorReducedDamage(target, damage); - char* spellStr = strtok((char*)NULL, " "); + char* spellStr = strtok(NULL, " "); // melee damage by specific school if (!spellStr) @@ -3544,20 +3544,20 @@ bool ChatHandler::HandleDamageCommand(const char * args) return true; } -bool ChatHandler::HandleModifyArenaCommand(const char * args) +bool ChatHandler::HandleModifyArenaCommand(char* args) { if (!*args) return false; Player *target = getSelectedPlayer(); - if(!target) + if (!target) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); return false; } - int32 amount = (uint32)atoi(args); + int32 amount = (int32)atoi(args); target->ModifyArenaPoints(amount); @@ -3566,11 +3566,11 @@ bool ChatHandler::HandleModifyArenaCommand(const char * args) return true; } -bool ChatHandler::HandleReviveCommand(const char* args) +bool ChatHandler::HandleReviveCommand(char* args) { Player* target; uint64 target_guid; - if(!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget(args, &target, &target_guid)) return false; if (target) @@ -3585,10 +3585,10 @@ bool ChatHandler::HandleReviveCommand(const char* args) return true; } -bool ChatHandler::HandleAuraCommand(const char* args) +bool ChatHandler::HandleAuraCommand(char* args) { Unit *target = getSelectedUnit(); - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -3596,10 +3596,9 @@ bool ChatHandler::HandleAuraCommand(const char* args) } // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form - uint32 spellID = extractSpellIdFromLink((char*)args); + uint32 spellID = extractSpellIdFromLink(args); - SpellEntry const *spellInfo = sSpellStore.LookupEntry( spellID ); - if(spellInfo) + if (SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID)) { SpellAuraHolder *holder = NULL; if (IsSpellAppliesAura(spellInfo, (1 << EFFECT_INDEX_0) | (1 << EFFECT_INDEX_1) | (1 << EFFECT_INDEX_2)) || IsSpellHaveEffect(spellInfo, SPELL_EFFECT_PERSISTENT_AREA_AURA)) @@ -3610,9 +3609,9 @@ bool ChatHandler::HandleAuraCommand(const char* args) uint8 eff = spellInfo->Effect[i]; if (eff>=TOTAL_SPELL_EFFECTS) continue; - if( IsAreaAuraEffect(eff) || + if (IsAreaAuraEffect(eff) || eff == SPELL_EFFECT_APPLY_AURA || - eff == SPELL_EFFECT_PERSISTENT_AREA_AURA ) + eff == SPELL_EFFECT_PERSISTENT_AREA_AURA) { Aura *aur = CreateAura(spellInfo, SpellEffectIndex(i), NULL, holder, target); holder->AddAura(aur, SpellEffectIndex(i)); @@ -3624,7 +3623,7 @@ bool ChatHandler::HandleAuraCommand(const char* args) return true; } -bool ChatHandler::HandleUnAuraCommand(const char* args) +bool ChatHandler::HandleUnAuraCommand(char* args) { Unit *target = getSelectedUnit(); if(!target) @@ -3642,7 +3641,7 @@ bool ChatHandler::HandleUnAuraCommand(const char* args) } // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form - uint32 spellID = extractSpellIdFromLink((char*)args); + uint32 spellID = extractSpellIdFromLink(args); if(!spellID) return false; @@ -3651,12 +3650,12 @@ bool ChatHandler::HandleUnAuraCommand(const char* args) return true; } -bool ChatHandler::HandleLinkGraveCommand(const char* args) +bool ChatHandler::HandleLinkGraveCommand(char* args) { - if(!*args) + if (!*args) return false; - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); if (!px) return false; @@ -3677,7 +3676,7 @@ bool ChatHandler::HandleLinkGraveCommand(const char* args) WorldSafeLocsEntry const* graveyard = sWorldSafeLocsStore.LookupEntry(g_id); - if(!graveyard ) + if (!graveyard ) { PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST, g_id); SetSentErrorMessage(true); @@ -3689,14 +3688,14 @@ bool ChatHandler::HandleLinkGraveCommand(const char* args) uint32 zoneId = player->GetZoneId(); AreaTableEntry const *areaEntry = GetAreaEntryByAreaID(zoneId); - if(!areaEntry || areaEntry->zone !=0 ) + if (!areaEntry || areaEntry->zone !=0) { PSendSysMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, g_id,zoneId); SetSentErrorMessage(true); return false; } - if(sObjectMgr.AddGraveYardLink(g_id,zoneId,g_team)) + if (sObjectMgr.AddGraveYardLink(g_id,zoneId,g_team)) PSendSysMessage(LANG_COMMAND_GRAVEYARDLINKED, g_id,zoneId); else PSendSysMessage(LANG_COMMAND_GRAVEYARDALRLINKED, g_id,zoneId); @@ -3704,7 +3703,7 @@ bool ChatHandler::HandleLinkGraveCommand(const char* args) return true; } -bool ChatHandler::HandleNearGraveCommand(const char* args) +bool ChatHandler::HandleNearGraveCommand(char* args) { uint32 g_team; @@ -3712,9 +3711,9 @@ bool ChatHandler::HandleNearGraveCommand(const char* args) if(!*args) g_team = 0; - else if (strncmp((char*)args,"horde",argslen)==0) + else if (strncmp(args, "horde", argslen) == 0) g_team = HORDE; - else if (strncmp((char*)args,"alliance",argslen)==0) + else if (strncmp(args, "alliance", argslen) == 0) g_team = ALLIANCE; else return false; @@ -3771,7 +3770,7 @@ bool ChatHandler::HandleNearGraveCommand(const char* args) } //-----------------------Npc Commands----------------------- -bool ChatHandler::HandleNpcAllowMovementCommand(const char* /*args*/) +bool ChatHandler::HandleNpcAllowMovementCommand(char* /*args*/) { if(sWorld.getAllowMovement()) { @@ -3786,7 +3785,7 @@ bool ChatHandler::HandleNpcAllowMovementCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleNpcChangeEntryCommand(const char *args) +bool ChatHandler::HandleNpcChangeEntryCommand(char *args) { if (!*args) return false; @@ -3810,7 +3809,7 @@ bool ChatHandler::HandleNpcChangeEntryCommand(const char *args) return true; } -bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/) +bool ChatHandler::HandleNpcInfoCommand(char* /*args*/) { Creature* target = getSelectedCreature(); @@ -3857,9 +3856,9 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/) } //play npc emote -bool ChatHandler::HandleNpcPlayEmoteCommand(const char* args) +bool ChatHandler::HandleNpcPlayEmoteCommand(char* args) { - uint32 emote = atoi((char*)args); + uint32 emote = atoi(args); Creature* target = getSelectedCreature(); if(!target) @@ -3876,7 +3875,7 @@ bool ChatHandler::HandleNpcPlayEmoteCommand(const char* args) //TODO: NpcCommands that needs to be fixed : -bool ChatHandler::HandleNpcAddWeaponCommand(const char* /*args*/) +bool ChatHandler::HandleNpcAddWeaponCommand(char* /*args*/) { /*if (!*args) return false; @@ -3945,12 +3944,12 @@ bool ChatHandler::HandleNpcAddWeaponCommand(const char* /*args*/) } //---------------------------------------------------------- -bool ChatHandler::HandleExploreCheatCommand(const char* args) +bool ChatHandler::HandleExploreCheatCommand(char* args) { if (!*args) return false; - int flag = atoi((char*)args); + int flag = atoi(args); Player *chr = getSelectedPlayer(); if (chr == NULL) @@ -3988,9 +3987,9 @@ bool ChatHandler::HandleExploreCheatCommand(const char* args) return true; } -bool ChatHandler::HandleHoverCommand(const char* args) +bool ChatHandler::HandleHoverCommand(char* args) { - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); uint32 flag; if (!px) flag = 1; @@ -4032,16 +4031,16 @@ void ChatHandler::HandleCharacterLevel(Player* player, uint64 player_guid, uint3 } } -bool ChatHandler::HandleCharacterLevelCommand(const char* args) +bool ChatHandler::HandleCharacterLevelCommand(char* args) { char* nameStr; char* levelStr; - extractOptFirstArg((char*)args,&nameStr,&levelStr); - if(!levelStr) + extractOptFirstArg(args, &nameStr, &levelStr); + if (!levelStr) return false; // exception opt second arg: .character level $name - if(isalpha(levelStr[0])) + if (isalpha(levelStr[0])) { nameStr = levelStr; levelStr = NULL; // current level will used @@ -4050,21 +4049,21 @@ bool ChatHandler::HandleCharacterLevelCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; int32 oldlevel = target ? target->getLevel() : Player::GetLevelFromDB(target_guid); int32 newlevel = levelStr ? atoi(levelStr) : oldlevel; - if(newlevel < 1) + if (newlevel < 1) return false; // invalid level - if(newlevel > STRONG_MAX_LEVEL) // hardcoded maximum level + if (newlevel > STRONG_MAX_LEVEL) // hardcoded maximum level newlevel = STRONG_MAX_LEVEL; HandleCharacterLevel(target,target_guid,oldlevel,newlevel); - if(!m_session || m_session->GetPlayer() != target) // including player==NULL + if (!m_session || m_session->GetPlayer() != target) // including player==NULL { std::string nameLink = playerLink(target_name); PSendSysMessage(LANG_YOU_CHANGE_LVL,nameLink.c_str(),newlevel); @@ -4073,14 +4072,14 @@ bool ChatHandler::HandleCharacterLevelCommand(const char* args) return true; } -bool ChatHandler::HandleLevelUpCommand(const char* args) +bool ChatHandler::HandleLevelUpCommand(char* args) { char* nameStr; char* levelStr; - extractOptFirstArg((char*)args,&nameStr,&levelStr); + extractOptFirstArg(args, &nameStr, &levelStr); // exception opt second arg: .character level $name - if(levelStr && isalpha(levelStr[0])) + if (levelStr && isalpha(levelStr[0])) { nameStr = levelStr; levelStr = NULL; // current level will used @@ -4089,22 +4088,22 @@ bool ChatHandler::HandleLevelUpCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; int32 oldlevel = target ? target->getLevel() : Player::GetLevelFromDB(target_guid); int32 addlevel = levelStr ? atoi(levelStr) : 1; int32 newlevel = oldlevel + addlevel; - if(newlevel < 1) + if (newlevel < 1) newlevel = 1; - if(newlevel > STRONG_MAX_LEVEL) // hardcoded maximum level + if (newlevel > STRONG_MAX_LEVEL) // hardcoded maximum level newlevel = STRONG_MAX_LEVEL; HandleCharacterLevel(target,target_guid,oldlevel,newlevel); - if(!m_session || m_session->GetPlayer() != target) // including chr==NULL + if (!m_session || m_session->GetPlayer() != target) // including chr==NULL { std::string nameLink = playerLink(target_name); PSendSysMessage(LANG_YOU_CHANGE_LVL,nameLink.c_str(),newlevel); @@ -4113,7 +4112,7 @@ bool ChatHandler::HandleLevelUpCommand(const char* args) return true; } -bool ChatHandler::HandleShowAreaCommand(const char* args) +bool ChatHandler::HandleShowAreaCommand(char* args) { if (!*args) return false; @@ -4126,7 +4125,7 @@ bool ChatHandler::HandleShowAreaCommand(const char* args) return false; } - int area = GetAreaFlagByAreaID(atoi((char*)args)); + int area = GetAreaFlagByAreaID(atoi(args)); int offset = area / 32; uint32 val = (uint32)(1 << (area % 32)); @@ -4144,7 +4143,7 @@ bool ChatHandler::HandleShowAreaCommand(const char* args) return true; } -bool ChatHandler::HandleHideAreaCommand(const char* args) +bool ChatHandler::HandleHideAreaCommand(char* args) { if (!*args) return false; @@ -4157,11 +4156,11 @@ bool ChatHandler::HandleHideAreaCommand(const char* args) return false; } - int area = GetAreaFlagByAreaID(atoi((char*)args)); + int area = GetAreaFlagByAreaID(atoi(args)); int offset = area / 32; uint32 val = (uint32)(1 << (area % 32)); - if(area<0 || offset >= PLAYER_EXPLORED_ZONES_SIZE) + if (area<0 || offset >= PLAYER_EXPLORED_ZONES_SIZE) { SendSysMessage(LANG_BAD_VALUE); SetSentErrorMessage(true); @@ -4175,28 +4174,28 @@ bool ChatHandler::HandleHideAreaCommand(const char* args) return true; } -bool ChatHandler::HandleAuctionAllianceCommand(const char* /*args*/) +bool ChatHandler::HandleAuctionAllianceCommand(char* /*args*/) { m_session->GetPlayer()->SetAuctionAccessMode(m_session->GetPlayer()->GetTeam() != ALLIANCE ? -1 : 0); m_session->SendAuctionHello(m_session->GetPlayer()); return true; } -bool ChatHandler::HandleAuctionHordeCommand(const char* /*args*/) +bool ChatHandler::HandleAuctionHordeCommand(char* /*args*/) { m_session->GetPlayer()->SetAuctionAccessMode(m_session->GetPlayer()->GetTeam() != HORDE ? -1 : 0); m_session->SendAuctionHello(m_session->GetPlayer()); return true; } -bool ChatHandler::HandleAuctionGoblinCommand(const char* /*args*/) +bool ChatHandler::HandleAuctionGoblinCommand(char* /*args*/) { m_session->GetPlayer()->SetAuctionAccessMode(1); m_session->SendAuctionHello(m_session->GetPlayer()); return true; } -bool ChatHandler::HandleAuctionCommand(const char* /*args*/) +bool ChatHandler::HandleAuctionCommand(char* /*args*/) { m_session->GetPlayer()->SetAuctionAccessMode(0); m_session->SendAuctionHello(m_session->GetPlayer()); @@ -4204,23 +4203,23 @@ bool ChatHandler::HandleAuctionCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleBankCommand(const char* /*args*/) +bool ChatHandler::HandleBankCommand(char* /*args*/) { m_session->SendShowBank( m_session->GetPlayer()->GetGUID() ); return true; } -bool ChatHandler::HandleStableCommand(const char* /*args*/) +bool ChatHandler::HandleStableCommand(char* /*args*/) { m_session->SendStablePet(m_session->GetPlayer()->GetGUID()); return true; } -bool ChatHandler::HandleChangeWeather(const char* args) +bool ChatHandler::HandleChangeWeatherCommand(char* args) { - if(!*args) + if (!*args) return false; //Weather is OFF @@ -4232,7 +4231,7 @@ bool ChatHandler::HandleChangeWeather(const char* args) } //*Change the weather of a cell - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); char* py = strtok(NULL, " "); if (!px || !py) @@ -4246,9 +4245,9 @@ bool ChatHandler::HandleChangeWeather(const char* args) Weather* wth = sWorld.FindWeather(zoneid); - if(!wth) + if (!wth) wth = sWorld.AddWeather(zoneid); - if(!wth) + if (!wth) { SendSysMessage(LANG_NO_WEATHER); SetSentErrorMessage(true); @@ -4260,7 +4259,7 @@ bool ChatHandler::HandleChangeWeather(const char* args) return true; } -bool ChatHandler::HandleTeleAddCommand(const char * args) +bool ChatHandler::HandleTeleAddCommand(char* args) { if(!*args) return false; @@ -4300,9 +4299,9 @@ bool ChatHandler::HandleTeleAddCommand(const char * args) return true; } -bool ChatHandler::HandleTeleDelCommand(const char * args) +bool ChatHandler::HandleTeleDelCommand(char* args) { - if(!*args) + if (!*args) return false; std::string name = args; @@ -4318,7 +4317,7 @@ bool ChatHandler::HandleTeleDelCommand(const char * args) return true; } -bool ChatHandler::HandleListAurasCommand (const char * /*args*/) +bool ChatHandler::HandleListAurasCommand (char* /*args*/) { Unit *unit = getSelectedUnit(); if(!unit) @@ -4398,7 +4397,7 @@ bool ChatHandler::HandleListAurasCommand (const char * /*args*/) return true; } -bool ChatHandler::HandleListTalentsCommand (const char * /*args*/) +bool ChatHandler::HandleListTalentsCommand(char* /*args*/) { Player *player = getSelectedPlayer(); if (!player) @@ -4435,11 +4434,11 @@ bool ChatHandler::HandleListTalentsCommand (const char * /*args*/) return true; } -bool ChatHandler::HandleResetAchievementsCommand (const char * args) +bool ChatHandler::HandleResetAchievementsCommand(char* args) { Player* target; uint64 target_guid; - if (!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget(args, &target, &target_guid)) return false; if(target) @@ -4450,10 +4449,10 @@ bool ChatHandler::HandleResetAchievementsCommand (const char * args) return true; } -bool ChatHandler::HandleResetHonorCommand (const char * args) +bool ChatHandler::HandleResetHonorCommand(char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget(args, &target)) return false; target->SetUInt32Value(PLAYER_FIELD_KILLS, 0); @@ -4504,13 +4503,13 @@ static bool HandleResetStatsOrLevelHelper(Player* player) return true; } -bool ChatHandler::HandleResetLevelCommand(const char * args) +bool ChatHandler::HandleResetLevelCommand(char* args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget(args, &target)) return false; - if(!HandleResetStatsOrLevelHelper(target)) + if (!HandleResetStatsOrLevelHelper(target)) return false; // set starting level @@ -4531,16 +4530,16 @@ bool ChatHandler::HandleResetLevelCommand(const char * args) target->_ApplyAllLevelScaleItemMods(true); // reset level for pet - if(Pet* pet = target->GetPet()) + if (Pet* pet = target->GetPet()) pet->SynchronizeLevelWithOwner(); return true; } -bool ChatHandler::HandleResetStatsCommand(const char * args) +bool ChatHandler::HandleResetStatsCommand(char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget(args, &target)) return false; if (!HandleResetStatsOrLevelHelper(target)) @@ -4555,15 +4554,15 @@ bool ChatHandler::HandleResetStatsCommand(const char * args) return true; } -bool ChatHandler::HandleResetSpellsCommand(const char * args) +bool ChatHandler::HandleResetSpellsCommand(char* args) { Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) + if (!extractPlayerTarget(args, &target, &target_guid, &target_name)) return false; - if(target) + if (target) { target->resetSpells(); @@ -4580,12 +4579,12 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args) return true; } -bool ChatHandler::HandleResetSpecsCommand(const char * args) +bool ChatHandler::HandleResetSpecsCommand(char* args) { Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) + if (!extractPlayerTarget(args, &target, &target_guid, &target_name)) return false; if (target) @@ -4616,11 +4615,11 @@ bool ChatHandler::HandleResetSpecsCommand(const char * args) return false; } -bool ChatHandler::HandleResetTalentsCommand(const char * args) +bool ChatHandler::HandleResetTalentsCommand(char* args) { Player* target; std::string target_name; - if (!extractPlayerTarget((char*)args, &target, NULL, &target_name)) + if (!extractPlayerTarget(args, &target, NULL, &target_name)) { // Try reset talents as Hunter Pet Creature* creature = getSelectedCreature(); @@ -4664,9 +4663,9 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) return false; } -bool ChatHandler::HandleResetAllCommand(const char * args) +bool ChatHandler::HandleResetAllCommand(char* args) { - if(!*args) + if (!*args) return false; std::string casename = args; @@ -4690,12 +4689,12 @@ bool ChatHandler::HandleResetAllCommand(const char * args) } else { - PSendSysMessage(LANG_RESETALL_UNKNOWN_CASE,args); + PSendSysMessage(LANG_RESETALL_UNKNOWN_CASE, args); SetSentErrorMessage(true); return false; } - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'",atLogin,atLogin); + CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'", atLogin, atLogin); HashMapHolder::MapType const& plist = sObjectAccessor.GetPlayers(); for(HashMapHolder::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr) itr->second->SetAtLoginFlag(atLogin); @@ -4703,21 +4702,21 @@ bool ChatHandler::HandleResetAllCommand(const char * args) return true; } -bool ChatHandler::HandleServerShutDownCancelCommand(const char* /*args*/) +bool ChatHandler::HandleServerShutDownCancelCommand(char* /*args*/) { sWorld.ShutdownCancel(); return true; } -bool ChatHandler::HandleServerShutDownCommand(const char* args) +bool ChatHandler::HandleServerShutDownCommand(char* args) { - if(!*args) + if (!*args) return false; - char* time_str = strtok ((char*) args, " "); - char* exitcode_str = strtok (NULL, ""); + char* time_str = strtok(args, " "); + char* exitcode_str = strtok(NULL, ""); - int32 time = atoi (time_str); + int32 time = atoi(time_str); ///- Prevent interpret wrong arg value as 0 secs shutdown time if ((time == 0 && (time_str[0]!='0' || time_str[1]!='\0')) || time < 0) @@ -4744,15 +4743,15 @@ bool ChatHandler::HandleServerShutDownCommand(const char* args) return true; } -bool ChatHandler::HandleServerRestartCommand(const char* args) +bool ChatHandler::HandleServerRestartCommand(char* args) { - if(!*args) + if (!*args) return false; - char* time_str = strtok ((char*) args, " "); - char* exitcode_str = strtok (NULL, ""); + char* time_str = strtok(args, " "); + char* exitcode_str = strtok(NULL, ""); - int32 time = atoi (time_str); + int32 time = atoi(time_str); ///- Prevent interpret wrong arg value as 0 secs shutdown time if ((time == 0 && (time_str[0]!='0' || time_str[1]!='\0')) || time < 0) @@ -4760,7 +4759,7 @@ bool ChatHandler::HandleServerRestartCommand(const char* args) if (exitcode_str) { - int32 exitcode = atoi (exitcode_str); + int32 exitcode = atoi(exitcode_str); // Handle atoi() errors if (exitcode == 0 && (exitcode_str[0] != '0' || exitcode_str[1] != '\0')) @@ -4772,22 +4771,22 @@ bool ChatHandler::HandleServerRestartCommand(const char* args) if (exitcode < 0 || exitcode > 125) return false; - sWorld.ShutdownServ (time, SHUTDOWN_MASK_RESTART, exitcode); + sWorld.ShutdownServ(time, SHUTDOWN_MASK_RESTART, exitcode); } else sWorld.ShutdownServ(time, SHUTDOWN_MASK_RESTART, RESTART_EXIT_CODE); return true; } -bool ChatHandler::HandleServerIdleRestartCommand(const char* args) +bool ChatHandler::HandleServerIdleRestartCommand(char* args) { - if(!*args) + if (!*args) return false; - char* time_str = strtok ((char*) args, " "); - char* exitcode_str = strtok (NULL, ""); + char* time_str = strtok(args, " "); + char* exitcode_str = strtok(NULL, ""); - int32 time = atoi (time_str); + int32 time = atoi(time_str); ///- Prevent interpret wrong arg value as 0 secs shutdown time if ((time == 0 && (time_str[0]!='0' || time_str[1]!='\0')) || time < 0) @@ -4795,7 +4794,7 @@ bool ChatHandler::HandleServerIdleRestartCommand(const char* args) if (exitcode_str) { - int32 exitcode = atoi (exitcode_str); + int32 exitcode = atoi(exitcode_str); // Handle atoi() errors if (exitcode == 0 && (exitcode_str[0] != '0' || exitcode_str[1] != '\0')) @@ -4807,22 +4806,22 @@ bool ChatHandler::HandleServerIdleRestartCommand(const char* args) if (exitcode < 0 || exitcode > 125) return false; - sWorld.ShutdownServ (time, SHUTDOWN_MASK_RESTART|SHUTDOWN_MASK_IDLE, exitcode); + sWorld.ShutdownServ(time, SHUTDOWN_MASK_RESTART|SHUTDOWN_MASK_IDLE, exitcode); } else sWorld.ShutdownServ(time,SHUTDOWN_MASK_RESTART|SHUTDOWN_MASK_IDLE,RESTART_EXIT_CODE); return true; } -bool ChatHandler::HandleServerIdleShutDownCommand(const char* args) +bool ChatHandler::HandleServerIdleShutDownCommand(char* args) { - if(!*args) + if (!*args) return false; - char* time_str = strtok ((char*) args, " "); - char* exitcode_str = strtok (NULL, ""); + char* time_str = strtok(args, " "); + char* exitcode_str = strtok(NULL, ""); - int32 time = atoi (time_str); + int32 time = atoi(time_str); ///- Prevent interpret wrong arg value as 0 secs shutdown time if ((time == 0 && (time_str[0]!='0' || time_str[1]!='\0')) || time < 0) @@ -4830,7 +4829,7 @@ bool ChatHandler::HandleServerIdleShutDownCommand(const char* args) if (exitcode_str) { - int32 exitcode = atoi (exitcode_str); + int32 exitcode = atoi(exitcode_str); // Handle atoi() errors if (exitcode == 0 && (exitcode_str[0] != '0' || exitcode_str[1] != '\0')) @@ -4842,14 +4841,14 @@ bool ChatHandler::HandleServerIdleShutDownCommand(const char* args) if (exitcode < 0 || exitcode > 125) return false; - sWorld.ShutdownServ (time, SHUTDOWN_MASK_IDLE, exitcode); + sWorld.ShutdownServ(time, SHUTDOWN_MASK_IDLE, exitcode); } else sWorld.ShutdownServ(time,SHUTDOWN_MASK_IDLE,SHUTDOWN_EXIT_CODE); return true; } -bool ChatHandler::HandleQuestAdd(const char* args) +bool ChatHandler::HandleQuestAddCommand(char* args) { Player* player = getSelectedPlayer(); if(!player) @@ -4861,8 +4860,8 @@ bool ChatHandler::HandleQuestAdd(const char* args) // .addquest #entry' // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hquest"); - if(!cId) + char* cId = extractKeyFromLink(args, "Hquest"); + if (!cId) return false; uint32 entry = atol(cId); @@ -4903,10 +4902,10 @@ bool ChatHandler::HandleQuestAdd(const char* args) return true; } -bool ChatHandler::HandleQuestRemove(const char* args) +bool ChatHandler::HandleQuestRemoveCommand(char* args) { Player* player = getSelectedPlayer(); - if(!player) + if (!player) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -4915,15 +4914,15 @@ bool ChatHandler::HandleQuestRemove(const char* args) // .removequest #entry' // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hquest"); - if(!cId) + char* cId = extractKeyFromLink(args, "Hquest"); + if (!cId) return false; uint32 entry = atol(cId); Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry); - if(!pQuest) + if (!pQuest) { PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry); SetSentErrorMessage(true); @@ -4934,7 +4933,7 @@ bool ChatHandler::HandleQuestRemove(const char* args) for(uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot ) { uint32 quest = player->GetQuestSlotQuestId(slot); - if(quest==entry) + if (quest==entry) { player->SetQuestSlot(slot,0); @@ -4953,10 +4952,10 @@ bool ChatHandler::HandleQuestRemove(const char* args) return true; } -bool ChatHandler::HandleQuestComplete(const char* args) +bool ChatHandler::HandleQuestCompleteCommand(char* args) { Player* player = getSelectedPlayer(); - if(!player) + if (!player) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -4965,8 +4964,8 @@ bool ChatHandler::HandleQuestComplete(const char* args) // .quest complete #entry // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hquest"); - if(!cId) + char* cId = extractKeyFromLink(args, "Hquest"); + if (!cId) return false; uint32 entry = atol(cId); @@ -4974,7 +4973,7 @@ bool ChatHandler::HandleQuestComplete(const char* args) Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry); // If player doesn't have the quest - if(!pQuest || player->GetQuestStatus(entry) == QUEST_STATUS_NONE) + if (!pQuest || player->GetQuestStatus(entry) == QUEST_STATUS_NONE) { PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry); SetSentErrorMessage(true); @@ -4986,14 +4985,14 @@ bool ChatHandler::HandleQuestComplete(const char* args) { uint32 id = pQuest->ReqItemId[x]; uint32 count = pQuest->ReqItemCount[x]; - if(!id || !count) + if (!id || !count) continue; uint32 curItemCount = player->GetItemCount(id,true); ItemPosCountVec dest; uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, id, count - curItemCount ); - if( msg == EQUIP_ERR_OK ) + if (msg == EQUIP_ERR_OK) { Item* item = player->StoreNewItem( dest, id, true); player->SendNewItem(item,count-curItemCount, true, false); @@ -5006,18 +5005,18 @@ bool ChatHandler::HandleQuestComplete(const char* args) int32 creature = pQuest->ReqCreatureOrGOId[i]; uint32 creaturecount = pQuest->ReqCreatureOrGOCount[i]; - if(uint32 spell_id = pQuest->ReqSpell[i]) + if (uint32 spell_id = pQuest->ReqSpell[i]) { for(uint16 z = 0; z < creaturecount; ++z) player->CastedCreatureOrGO(creature, ObjectGuid(), spell_id); } - else if(creature > 0) + else if (creature > 0) { - if(CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(creature)) + if (CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(creature)) for(uint16 z = 0; z < creaturecount; ++z) player->KilledMonster(cInfo, ObjectGuid()); } - else if(creature < 0) + else if (creature < 0) { for(uint16 z = 0; z < creaturecount; ++z) player->CastedCreatureOrGO(-creature, ObjectGuid(), 0); @@ -5029,41 +5028,41 @@ bool ChatHandler::HandleQuestComplete(const char* args) { uint32 repValue = pQuest->GetRepObjectiveValue(); uint32 curRep = player->GetReputationMgr().GetReputation(repFaction); - if(curRep < repValue) - if(FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction)) + if (curRep < repValue) + if (FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction)) player->GetReputationMgr().SetReputation(factionEntry,repValue); } // If the quest requires money int32 ReqOrRewMoney = pQuest->GetRewOrReqMoney(); - if(ReqOrRewMoney < 0) + if (ReqOrRewMoney < 0) player->ModifyMoney(-ReqOrRewMoney); player->CompleteQuest(entry); return true; } -bool ChatHandler::HandleBanAccountCommand(const char* args) +bool ChatHandler::HandleBanAccountCommand(char* args) { - return HandleBanHelper(BAN_ACCOUNT,args); + return HandleBanHelper(BAN_ACCOUNT, args); } -bool ChatHandler::HandleBanCharacterCommand(const char* args) +bool ChatHandler::HandleBanCharacterCommand(char* args) { - return HandleBanHelper(BAN_CHARACTER,args); + return HandleBanHelper(BAN_CHARACTER, args); } -bool ChatHandler::HandleBanIPCommand(const char* args) +bool ChatHandler::HandleBanIPCommand(char* args) { - return HandleBanHelper(BAN_IP,args); + return HandleBanHelper(BAN_IP, args); } -bool ChatHandler::HandleBanHelper(BanMode mode, const char* args) +bool ChatHandler::HandleBanHelper(BanMode mode, char* args) { if (!*args) return false; - char* cnameOrIP = strtok ((char*)args, " "); + char* cnameOrIP = strtok(args, " "); if (!cnameOrIP) return false; @@ -5131,28 +5130,28 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char* args) return true; } -bool ChatHandler::HandleUnBanAccountCommand(const char* args) +bool ChatHandler::HandleUnBanAccountCommand(char* args) { return HandleUnBanHelper(BAN_ACCOUNT,args); } -bool ChatHandler::HandleUnBanCharacterCommand(const char* args) +bool ChatHandler::HandleUnBanCharacterCommand(char* args) { return HandleUnBanHelper(BAN_CHARACTER,args); } -bool ChatHandler::HandleUnBanIPCommand(const char* args) +bool ChatHandler::HandleUnBanIPCommand(char* args) { return HandleUnBanHelper(BAN_IP,args); } -bool ChatHandler::HandleUnBanHelper(BanMode mode, const char* args) +bool ChatHandler::HandleUnBanHelper(BanMode mode, char* args) { if (!*args) return false; - char* cnameOrIP = strtok ((char*)args, " "); - if(!cnameOrIP) + char* cnameOrIP = strtok(args, " "); + if (!cnameOrIP) return false; std::string nameOrIP = cnameOrIP; @@ -5189,24 +5188,24 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char* args) return true; } -bool ChatHandler::HandleBanInfoAccountCommand(const char* args) +bool ChatHandler::HandleBanInfoAccountCommand(char* args) { if (!*args) return false; std::string account_name; - uint32 accountid = extractAccountId((char*)args, &account_name); + uint32 accountid = extractAccountId(args, &account_name); if (!accountid) return false; return HandleBanInfoHelper(accountid,account_name.c_str()); } -bool ChatHandler::HandleBanInfoCharacterCommand(const char* args) +bool ChatHandler::HandleBanInfoCharacterCommand(char* args) { Player* target; uint64 target_guid; - if (!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget(args, &target, &target_guid)) return false; uint32 accountid = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid); @@ -5249,12 +5248,12 @@ bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname) return true; } -bool ChatHandler::HandleBanInfoIPCommand(const char* args) +bool ChatHandler::HandleBanInfoIPCommand(char* args) { if (!*args) return false; - char* cIP = strtok ((char*)args, ""); + char* cIP = strtok (args, ""); if(!cIP) return false; @@ -5280,11 +5279,11 @@ bool ChatHandler::HandleBanInfoIPCommand(const char* args) return true; } -bool ChatHandler::HandleBanListCharacterCommand(const char* args) +bool ChatHandler::HandleBanListCharacterCommand(char* args) { LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); - char* cFilter = strtok ((char*)args, " "); + char* cFilter = strtok (args, " "); if(!cFilter) return false; @@ -5300,11 +5299,11 @@ bool ChatHandler::HandleBanListCharacterCommand(const char* args) return HandleBanListHelper(result); } -bool ChatHandler::HandleBanListAccountCommand(const char* args) +bool ChatHandler::HandleBanListAccountCommand(char* args) { LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); - char* cFilter = strtok((char*)args, " "); + char* cFilter = strtok(args, " "); std::string filter = cFilter ? cFilter : ""; LoginDatabase.escape_string(filter); @@ -5409,11 +5408,11 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result) return true; } -bool ChatHandler::HandleBanListIPCommand(const char* args) +bool ChatHandler::HandleBanListIPCommand(char* args) { LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); - char* cFilter = strtok((char*)args, " "); + char* cFilter = strtok(args, " "); std::string filter = cFilter ? cFilter : ""; LoginDatabase.escape_string(filter); @@ -5483,7 +5482,7 @@ bool ChatHandler::HandleBanListIPCommand(const char* args) return true; } -bool ChatHandler::HandleRespawnCommand(const char* /*args*/) +bool ChatHandler::HandleRespawnCommand(char* /*args*/) { Player* pl = m_session->GetPlayer(); @@ -5509,7 +5508,7 @@ bool ChatHandler::HandleRespawnCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleGMFlyCommand(const char* args) +bool ChatHandler::HandleGMFlyCommand(char* args) { if (!*args) return false; @@ -5535,12 +5534,12 @@ bool ChatHandler::HandleGMFlyCommand(const char* args) return true; } -bool ChatHandler::HandlePDumpLoadCommand(const char *args) +bool ChatHandler::HandlePDumpLoadCommand(char *args) { if (!*args) return false; - char* file = strtok((char*)args, " "); + char* file = strtok(args, " "); if (!file) return false; @@ -5625,12 +5624,12 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) return true; } -bool ChatHandler::HandlePDumpWriteCommand(const char *args) +bool ChatHandler::HandlePDumpWriteCommand(char *args) { if (!*args) return false; - char* file = strtok((char*)args, " "); + char* file = strtok(args, " "); char* p2 = strtok(NULL, " "); if(!file || !p2) @@ -5678,7 +5677,7 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args) return true; } -bool ChatHandler::HandleMovegensCommand(const char* /*args*/) +bool ChatHandler::HandleMovegensCommand(char* /*args*/) { Unit* unit = getSelectedUnit(); if(!unit) @@ -5759,12 +5758,12 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleServerPLimitCommand(const char *args) +bool ChatHandler::HandleServerPLimitCommand(char *args) { - if(*args) + if (*args) { - char* param = strtok((char*)args, " "); - if(!param) + char* param = strtok(args, " "); + if (!param) return false; int l = strlen(param); @@ -5809,9 +5808,9 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args) return true; } -bool ChatHandler::HandleCastCommand(const char* args) +bool ChatHandler::HandleCastCommand(char* args) { - if(!*args) + if (!*args) return false; Unit* target = getSelectedUnit(); @@ -5824,15 +5823,15 @@ bool ChatHandler::HandleCastCommand(const char* args) } // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form - uint32 spell = extractSpellIdFromLink((char*)args); - if(!spell) + uint32 spell = extractSpellIdFromLink(args); + if (!spell) return false; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell); - if(!spellInfo) + if (!spellInfo) return false; - if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) + if (!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) { PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell); SetSentErrorMessage(true); @@ -5854,7 +5853,7 @@ bool ChatHandler::HandleCastCommand(const char* args) return true; } -bool ChatHandler::HandleCastBackCommand(const char* args) +bool ChatHandler::HandleCastBackCommand(char* args) { Creature* caster = getSelectedCreature(); @@ -5867,8 +5866,8 @@ bool ChatHandler::HandleCastBackCommand(const char* args) // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form - uint32 spell = extractSpellIdFromLink((char*)args); - if(!spell || !sSpellStore.LookupEntry(spell)) + uint32 spell = extractSpellIdFromLink(args); + if (!spell || !sSpellStore.LookupEntry(spell)) return false; char* trig_str = strtok(NULL, " "); @@ -5888,21 +5887,21 @@ bool ChatHandler::HandleCastBackCommand(const char* args) return true; } -bool ChatHandler::HandleCastDistCommand(const char* args) +bool ChatHandler::HandleCastDistCommand(char* args) { - if(!*args) + if (!*args) return false; // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form - uint32 spell = extractSpellIdFromLink((char*)args); - if(!spell) + uint32 spell = extractSpellIdFromLink(args); + if (!spell) return false; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell); - if(!spellInfo) + if (!spellInfo) return false; - if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) + if (!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) { PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell); SetSentErrorMessage(true); @@ -5933,18 +5932,18 @@ bool ChatHandler::HandleCastDistCommand(const char* args) return true; } -bool ChatHandler::HandleCastTargetCommand(const char* args) +bool ChatHandler::HandleCastTargetCommand(char* args) { Creature* caster = getSelectedCreature(); - if(!caster) + if (!caster) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); return false; } - if(!caster->getVictim()) + if (!caster->getVictim()) { SendSysMessage(LANG_SELECTED_TARGET_NOT_HAVE_VICTIM); SetSentErrorMessage(true); @@ -5952,15 +5951,15 @@ bool ChatHandler::HandleCastTargetCommand(const char* args) } // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form - uint32 spell = extractSpellIdFromLink((char*)args); - if(!spell || !sSpellStore.LookupEntry(spell)) + uint32 spell = extractSpellIdFromLink(args); + if (!spell || !sSpellStore.LookupEntry(spell)) return false; char* trig_str = strtok(NULL, " "); - if(trig_str) + if (trig_str) { int l = strlen(trig_str); - if(strncmp(trig_str,"triggered",l) != 0 ) + if (strncmp(trig_str,"triggered",l) != 0 ) return false; } @@ -5978,20 +5977,20 @@ ComeToMe command REQUIRED for 3rd party scripting library to have access to Poin Without this function 3rd party scripting library will get linking errors (unresolved external) when attempting to use the PointMovementGenerator */ -bool ChatHandler::HandleComeToMeCommand(const char *args) +bool ChatHandler::HandleComeToMeCommand(char *args) { Creature* caster = getSelectedCreature(); - if(!caster) + if (!caster) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); return false; } - char* newFlagStr = strtok((char*)args, " "); + char* newFlagStr = strtok(args, " "); - if(!newFlagStr) + if (!newFlagStr) return false; uint32 newFlags = atoi(newFlagStr); @@ -6004,14 +6003,14 @@ bool ChatHandler::HandleComeToMeCommand(const char *args) return true; } -bool ChatHandler::HandleCastSelfCommand(const char* args) +bool ChatHandler::HandleCastSelfCommand(char* args) { - if(!*args) + if (!*args) return false; Unit* target = getSelectedUnit(); - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -6019,12 +6018,12 @@ bool ChatHandler::HandleCastSelfCommand(const char* args) } // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form - uint32 spell = extractSpellIdFromLink((char*)args); - if(!spell) + uint32 spell = extractSpellIdFromLink(args); + if (!spell) return false; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell); - if(!spellInfo) + if (!spellInfo) return false; if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) @@ -6039,21 +6038,7 @@ bool ChatHandler::HandleCastSelfCommand(const char* args) return true; } -std::string GetTimeString(time_t time) -{ - time_t days = time / DAY; - time_t hours = (time % DAY) / HOUR; - time_t minute = (time % HOUR) / MINUTE; - std::ostringstream ss; - if(days) - ss << days << "d "; - if(hours) - ss << hours << "h "; - ss << minute << "m"; - return ss.str(); -} - -bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/) +bool ChatHandler::HandleInstanceListBindsCommand(char* /*args*/) { Player* player = getSelectedPlayer(); if (!player) player = m_session->GetPlayer(); @@ -6064,7 +6049,7 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/) for(Player::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr) { InstanceSave *save = itr->second.save; - std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL)); + std::string timeleft = secsToTimeString(save->GetResetTime() - time(NULL), true); if (const MapEntry* entry = sMapStore.LookupEntry(itr->first)) { PSendSysMessage("map: %d (%s) inst: %d perm: %s diff: %d canReset: %s TTR: %s", @@ -6087,7 +6072,7 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/) for(Group::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr) { InstanceSave *save = itr->second.save; - std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL)); + std::string timeleft = secsToTimeString(save->GetResetTime() - time(NULL), true); if (const MapEntry* entry = sMapStore.LookupEntry(itr->first)) { PSendSysMessage("map: %d (%s) inst: %d perm: %s diff: %d canReset: %s TTR: %s", @@ -6105,9 +6090,9 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleInstanceUnbindCommand(const char* args) +bool ChatHandler::HandleInstanceUnbindCommand(char* args) { - if(!*args) + if (!*args) return false; Player* player = getSelectedPlayer(); @@ -6117,9 +6102,9 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char* args) uint32 mapid = 0; bool got_map = false; - if (strncmp(args,"all",strlen(args)) != 0) + if (strncmp(args, "all", strlen(args)) != 0) { - if(!isNumeric(args[0])) + if (!isNumeric(args[0])) return false; got_map = true; @@ -6139,7 +6124,7 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char* args) if(itr->first != player->GetMapId()) { InstanceSave *save = itr->second.save; - std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL)); + std::string timeleft = secsToTimeString(save->GetResetTime() - time(NULL), true); if (const MapEntry* entry = sMapStore.LookupEntry(itr->first)) { @@ -6160,7 +6145,7 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char* args) return true; } -bool ChatHandler::HandleInstanceStatsCommand(const char* /*args*/) +bool ChatHandler::HandleInstanceStatsCommand(char* /*args*/) { PSendSysMessage("instances loaded: %d", sMapMgr.GetNumInstances()); PSendSysMessage("players in instances: %d", sMapMgr.GetNumPlayersInInstances()); @@ -6170,7 +6155,7 @@ bool ChatHandler::HandleInstanceStatsCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleInstanceSaveDataCommand(const char * /*args*/) +bool ChatHandler::HandleInstanceSaveDataCommand(char* /*args*/) { Player* pl = m_session->GetPlayer(); @@ -6194,7 +6179,7 @@ bool ChatHandler::HandleInstanceSaveDataCommand(const char * /*args*/) } /// Display the list of GMs -bool ChatHandler::HandleGMListFullCommand(const char* /*args*/) +bool ChatHandler::HandleGMListFullCommand(char* /*args*/) { ///- Get the accounts with GM Level >0 QueryResult *result = LoginDatabase.Query( "SELECT username,gmlevel FROM account WHERE gmlevel > 0" ); @@ -6221,7 +6206,7 @@ bool ChatHandler::HandleGMListFullCommand(const char* /*args*/) } /// Define the 'Message of the day' for the realm -bool ChatHandler::HandleServerSetMotdCommand(const char* args) +bool ChatHandler::HandleServerSetMotdCommand(char* args) { sWorld.SetMotd(args); PSendSysMessage(LANG_MOTD_NEW, args); @@ -6291,12 +6276,12 @@ bool ChatHandler::ShowPlayerListHelper(QueryResult* result, uint32* limit, bool /// Output list of character for account -bool ChatHandler::HandleAccountCharactersCommand(const char* args) +bool ChatHandler::HandleAccountCharactersCommand(char* args) { ///- Get the command line arguments std::string account_name; Player* target = NULL; // only for triggering use targeted player account - uint32 account_id = extractAccountId((char*)args, &account_name, &target); + uint32 account_id = extractAccountId(args, &account_name, &target); if (!account_id ) return false; @@ -6307,13 +6292,13 @@ bool ChatHandler::HandleAccountCharactersCommand(const char* args) } /// Set/Unset the expansion level for an account -bool ChatHandler::HandleAccountSetAddonCommand(const char* args) +bool ChatHandler::HandleAccountSetAddonCommand(char* args) { ///- Get the command line arguments char* arg1; char* arg2; - extractOptFirstArg((char*)args, &arg1, &arg2); + extractOptFirstArg(args, &arg1, &arg2); std::string account_name; uint32 account_id = extractAccountId(arg1, &account_name); @@ -6337,17 +6322,17 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char* args) } //Send items by mail -bool ChatHandler::HandleSendItemsCommand(const char* args) +bool ChatHandler::HandleSendItemsCommand(char* args) { // format: name "subject text" "mail text" item1[:count1] item2[:count2] ... item12[:count12] Player* receiver; uint64 receiver_guid; std::string receiver_name; - if(!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name)) + if (!extractPlayerTarget(args, &receiver, &receiver_guid, &receiver_name)) return false; char* tail1 = strtok(NULL, ""); - if(!tail1) + if (!tail1) return false; char* msgSubject = extractQuotedArg(tail1); @@ -6443,14 +6428,14 @@ bool ChatHandler::HandleSendItemsCommand(const char* args) } ///Send money by mail -bool ChatHandler::HandleSendMoneyCommand(const char* args) +bool ChatHandler::HandleSendMoneyCommand(char* args) { /// format: name "subject text" "mail text" money Player* receiver; uint64 receiver_guid; std::string receiver_name; - if(!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name)) + if (!extractPlayerTarget(args, &receiver, &receiver_guid, &receiver_name)) return false; char* tail1 = strtok(NULL, ""); @@ -6491,19 +6476,19 @@ bool ChatHandler::HandleSendMoneyCommand(const char* args) } /// Send a message to a player in game -bool ChatHandler::HandleSendMessageCommand(const char* args) +bool ChatHandler::HandleSendMessageCommand(char* args) { ///- Find the player Player *rPlayer; - if(!extractPlayerTarget((char*)args,&rPlayer)) + if (!extractPlayerTarget(args, &rPlayer)) return false; char* msg_str = strtok(NULL, ""); - if(!msg_str) + if (!msg_str) return false; ///- Check that he is not logging out. - if(rPlayer->GetSession()->isLogingOut()) + if (rPlayer->GetSession()->isLogingOut()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -6521,20 +6506,20 @@ bool ChatHandler::HandleSendMessageCommand(const char* args) return true; } -bool ChatHandler::HandleFlushArenaPointsCommand(const char * /*args*/) +bool ChatHandler::HandleFlushArenaPointsCommand(char* /*args*/) { sBattleGroundMgr.DistributeArenaPoints(); return true; } -bool ChatHandler::HandleModifyGenderCommand(const char *args) +bool ChatHandler::HandleModifyGenderCommand(char *args) { - if(!*args) + if (!*args) return false; Player *player = getSelectedPlayer(); - if(!player) + if (!player) { PSendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -6545,12 +6530,12 @@ bool ChatHandler::HandleModifyGenderCommand(const char *args) if(!info) return false; - char const* gender_str = (char*)args; + char* gender_str = args; int gender_len = strlen(gender_str); Gender gender; - if(!strncmp(gender_str, "male", gender_len)) // MALE + if (!strncmp(gender_str, "male", gender_len)) // MALE { if(player->getGender() == GENDER_MALE) return true; diff --git a/src/game/debugcmds.cpp b/src/game/debugcmds.cpp index 91292265d..f05eef074 100644 --- a/src/game/debugcmds.cpp +++ b/src/game/debugcmds.cpp @@ -33,12 +33,12 @@ #include "ObjectGuid.h" #include "SpellMgr.h" -bool ChatHandler::HandleDebugSendSpellFailCommand(const char* args) +bool ChatHandler::HandleDebugSendSpellFailCommand(char* args) { if (!*args) return false; - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); if (!px) return false; @@ -66,7 +66,7 @@ bool ChatHandler::HandleDebugSendSpellFailCommand(const char* args) return true; } -bool ChatHandler::HandleDebugSendPoiCommand(const char* args) +bool ChatHandler::HandleDebugSendPoiCommand(char* args) { if (!*args) return false; @@ -79,7 +79,7 @@ bool ChatHandler::HandleDebugSendPoiCommand(const char* args) return true; } - char* icon_text = strtok((char*)args, " "); + char* icon_text = strtok(args, " "); char* flags_text = strtok(NULL, " "); if (!icon_text || !flags_text) return false; @@ -92,7 +92,7 @@ bool ChatHandler::HandleDebugSendPoiCommand(const char* args) return true; } -bool ChatHandler::HandleDebugSendEquipErrorCommand(const char* args) +bool ChatHandler::HandleDebugSendEquipErrorCommand(char* args) { if (!*args) return false; @@ -102,7 +102,7 @@ bool ChatHandler::HandleDebugSendEquipErrorCommand(const char* args) return true; } -bool ChatHandler::HandleDebugSendSellErrorCommand(const char* args) +bool ChatHandler::HandleDebugSendSellErrorCommand(char* args) { if (!*args) return false; @@ -112,7 +112,7 @@ bool ChatHandler::HandleDebugSendSellErrorCommand(const char* args) return true; } -bool ChatHandler::HandleDebugSendBuyErrorCommand(const char* args) +bool ChatHandler::HandleDebugSendBuyErrorCommand(char* args) { if (!*args) return false; @@ -122,7 +122,7 @@ bool ChatHandler::HandleDebugSendBuyErrorCommand(const char* args) return true; } -bool ChatHandler::HandleDebugSendOpcodeCommand(const char* /*args*/) +bool ChatHandler::HandleDebugSendOpcodeCommand(char* /*args*/) { Unit *unit = getSelectedUnit(); if (!unit || (unit->GetTypeId() != TYPEID_PLAYER)) @@ -199,9 +199,9 @@ bool ChatHandler::HandleDebugSendOpcodeCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleDebugUpdateWorldStateCommand(const char* args) +bool ChatHandler::HandleDebugUpdateWorldStateCommand(char* args) { - char* w = strtok((char*)args, " "); + char* w = strtok(args, " "); char* s = strtok(NULL, " "); if (!w || !s) @@ -213,7 +213,7 @@ bool ChatHandler::HandleDebugUpdateWorldStateCommand(const char* args) return true; } -bool ChatHandler::HandleDebugPlayCinematicCommand(const char* args) +bool ChatHandler::HandleDebugPlayCinematicCommand(char* args) { // USAGE: .debug play cinematic #cinematicid // #cinematicid - ID decimal number from CinemaicSequences.dbc (1st column) @@ -224,7 +224,7 @@ bool ChatHandler::HandleDebugPlayCinematicCommand(const char* args) return false; } - uint32 dwId = atoi((char*)args); + uint32 dwId = atoi(args); if (!sCinematicSequencesStore.LookupEntry(dwId)) { @@ -237,7 +237,7 @@ bool ChatHandler::HandleDebugPlayCinematicCommand(const char* args) return true; } -bool ChatHandler::HandleDebugPlayMovieCommand(const char* args) +bool ChatHandler::HandleDebugPlayMovieCommand(char* args) { // USAGE: .debug play movie #movieid // #movieid - ID decimal number from Movie.dbc (1st column) @@ -248,7 +248,7 @@ bool ChatHandler::HandleDebugPlayMovieCommand(const char* args) return false; } - uint32 dwId = atoi((char*)args); + uint32 dwId = atoi(args); if (!sMovieStore.LookupEntry(dwId)) { @@ -262,7 +262,7 @@ bool ChatHandler::HandleDebugPlayMovieCommand(const char* args) } //Play sound -bool ChatHandler::HandleDebugPlaySoundCommand(const char* args) +bool ChatHandler::HandleDebugPlaySoundCommand(char* args) { // USAGE: .debug playsound #soundid // #soundid - ID decimal number from SoundEntries.dbc (1st column) @@ -273,7 +273,7 @@ bool ChatHandler::HandleDebugPlaySoundCommand(const char* args) return false; } - uint32 dwSoundId = atoi((char*)args); + uint32 dwSoundId = atoi(args); if (!sSoundEntriesStore.LookupEntry(dwSoundId)) { @@ -300,7 +300,7 @@ bool ChatHandler::HandleDebugPlaySoundCommand(const char* args) } //Send notification in channel -bool ChatHandler::HandleDebugSendChannelNotifyCommand(const char* args) +bool ChatHandler::HandleDebugSendChannelNotifyCommand(char* args) { if (!*args) return false; @@ -318,7 +318,7 @@ bool ChatHandler::HandleDebugSendChannelNotifyCommand(const char* args) } //Send notification in chat -bool ChatHandler::HandleDebugSendChatMsgCommand(const char* args) +bool ChatHandler::HandleDebugSendChatMsgCommand(char* args) { if (!*args) return false; @@ -331,14 +331,14 @@ bool ChatHandler::HandleDebugSendChatMsgCommand(const char* args) return true; } -bool ChatHandler::HandleDebugSendQuestPartyMsgCommand(const char* args) +bool ChatHandler::HandleDebugSendQuestPartyMsgCommand(char* args) { - uint32 msg = atol((char*)args); + uint32 msg = atol(args); m_session->GetPlayer()->SendPushToPartyResponse(m_session->GetPlayer(), msg); return true; } -bool ChatHandler::HandleDebugGetLootRecipientCommand(const char* /*args*/) +bool ChatHandler::HandleDebugGetLootRecipientCommand(char* /*args*/) { Creature* target = getSelectedCreature(); if (!target) @@ -357,14 +357,14 @@ bool ChatHandler::HandleDebugGetLootRecipientCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleDebugSendQuestInvalidMsgCommand(const char* args) +bool ChatHandler::HandleDebugSendQuestInvalidMsgCommand(char* args) { - uint32 msg = atol((char*)args); + uint32 msg = atol(args); m_session->GetPlayer()->SendCanTakeQuestResponse(msg); return true; } -bool ChatHandler::HandleDebugGetItemStateCommand(const char* args) +bool ChatHandler::HandleDebugGetItemStateCommand(char* args) { if (!*args) return false; @@ -598,24 +598,24 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args) return true; } -bool ChatHandler::HandleDebugBattlegroundCommand(const char * /*args*/) +bool ChatHandler::HandleDebugBattlegroundCommand(char* /*args*/) { sBattleGroundMgr.ToggleTesting(); return true; } -bool ChatHandler::HandleDebugArenaCommand(const char * /*args*/) +bool ChatHandler::HandleDebugArenaCommand(char* /*args*/) { sBattleGroundMgr.ToggleArenaTesting(); return true; } -bool ChatHandler::HandleDebugSpawnVehicle(const char* args) +bool ChatHandler::HandleDebugSpawnVehicleCommand(char* args) { if (!*args) return false; - char* e = strtok((char*)args, " "); + char* e = strtok(args, " "); char* i = strtok(NULL, " "); if (!e || !i) @@ -660,14 +660,14 @@ bool ChatHandler::HandleDebugSpawnVehicle(const char* args) return true; } -bool ChatHandler::HandleDebugSpellCheckCommand(const char* /*args*/) +bool ChatHandler::HandleDebugSpellCheckCommand(char* /*args*/) { sLog.outString( "Check expected in code spell properties base at table 'spell_check' content..."); sSpellMgr.CheckUsedSpells("spell_check"); return true; } -bool ChatHandler::HandleDebugSendLargePacketCommand(const char* /*args*/) +bool ChatHandler::HandleDebugSendLargePacketCommand(char* /*args*/) { const char* stuffingString = "This is a dummy string to push the packet's size beyond 128000 bytes. "; std::ostringstream ss; @@ -677,7 +677,7 @@ bool ChatHandler::HandleDebugSendLargePacketCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleDebugSendSetPhaseShiftCommand(const char* args) +bool ChatHandler::HandleDebugSendSetPhaseShiftCommand(char* args) { if (!*args) return false; @@ -687,12 +687,12 @@ bool ChatHandler::HandleDebugSendSetPhaseShiftCommand(const char* args) return true; } -bool ChatHandler::HandleDebugGetItemValueCommand(const char* args) +bool ChatHandler::HandleDebugGetItemValueCommand(char* args) { if (!*args) return false; - char* e = strtok((char*)args, " "); + char* e = strtok(args, " "); char* f = strtok(NULL, " "); if (!e || !f) @@ -716,12 +716,12 @@ bool ChatHandler::HandleDebugGetItemValueCommand(const char* args) return true; } -bool ChatHandler::HandleDebugSetItemValueCommand(const char* args) +bool ChatHandler::HandleDebugSetItemValueCommand(char* args) { if (!*args) return false; - char* e = strtok((char*)args, " "); + char* e = strtok(args, " "); char* f = strtok(NULL, " "); char* g = strtok(NULL, " "); @@ -746,17 +746,17 @@ bool ChatHandler::HandleDebugSetItemValueCommand(const char* args) } //show animation -bool ChatHandler::HandleDebugAnimCommand(const char* args) +bool ChatHandler::HandleDebugAnimCommand(char* args) { if (!*args) return false; - uint32 emote_id = atoi((char*)args); + uint32 emote_id = atoi(args); m_session->GetPlayer()->HandleEmoteCommand(emote_id); return true; } -bool ChatHandler::HandleDebugSetAuraStateCommand(const char* args) +bool ChatHandler::HandleDebugSetAuraStateCommand(char* args) { if (!*args) { @@ -773,7 +773,7 @@ bool ChatHandler::HandleDebugSetAuraStateCommand(const char* args) return false; } - int32 state = atoi((char*)args); + int32 state = atoi(args); if (!state) { // reset all states @@ -786,12 +786,12 @@ bool ChatHandler::HandleDebugSetAuraStateCommand(const char* args) return true; } -bool ChatHandler::HandleDebugSetValueCommand(const char* args) +bool ChatHandler::HandleDebugSetValueCommand(char* args) { if(!*args) return false; - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); char* py = strtok(NULL, " "); char* pz = strtok(NULL, " "); @@ -837,12 +837,12 @@ bool ChatHandler::HandleDebugSetValueCommand(const char* args) return true; } -bool ChatHandler::HandleDebugGetValueCommand(const char* args) +bool ChatHandler::HandleDebugGetValueCommand(char* args) { if(!*args) return false; - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); char* pz = strtok(NULL, " "); if (!px) @@ -886,12 +886,12 @@ bool ChatHandler::HandleDebugGetValueCommand(const char* args) return true; } -bool ChatHandler::HandleDebugMod32ValueCommand(const char* args) +bool ChatHandler::HandleDebugMod32ValueCommand(char* args) { if(!*args) return false; - char* px = strtok((char*)args, " "); + char* px = strtok(args, " "); char* py = strtok(NULL, " "); if (!px || !py) @@ -918,7 +918,7 @@ bool ChatHandler::HandleDebugMod32ValueCommand(const char* args) return true; } -bool ChatHandler::HandleDebugUpdateCommand(const char* args) +bool ChatHandler::HandleDebugUpdateCommand(char* args) { if(!*args) return false; @@ -926,7 +926,7 @@ bool ChatHandler::HandleDebugUpdateCommand(const char* args) uint32 updateIndex; uint32 value; - char* pUpdateIndex = strtok((char*)args, " "); + char* pUpdateIndex = strtok(args, " "); Unit* chr = getSelectedUnit(); if (chr == NULL) diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/CliRunnable.cpp index 6de8f1789..3fcb58055 100644 --- a/src/mangosd/CliRunnable.cpp +++ b/src/mangosd/CliRunnable.cpp @@ -59,20 +59,20 @@ void commandFinished(void*, bool sucess) /// Delete a user account and all associated characters in this realm /// \todo This function has to be enhanced to respect the login/realm split (delete char, delete account chars in realm, delete account chars in realm then delete account -bool ChatHandler::HandleAccountDeleteCommand(const char* args) +bool ChatHandler::HandleAccountDeleteCommand(char* args) { if (!*args) return false; std::string account_name; - uint32 account_id = extractAccountId((char*)args,&account_name); + uint32 account_id = extractAccountId(args, &account_name); if (!account_id) return false; /// Commands not recommended call from chat, but support anyway /// can delete only for account with less security /// This is also reject self apply in fact - if(HasLowerSecurityAccount (NULL,account_id,true)) + if (HasLowerSecurityAccount (NULL, account_id, true)) return false; AccountOpResult result = sAccountMgr.DeleteAccount(account_id); @@ -227,7 +227,7 @@ void ChatHandler::HandleCharacterDeletedListHelper(DeletedInfoList const& foundL * * @param args the search string which either contains a player GUID or a part fo the character-name */ -bool ChatHandler::HandleCharacterDeletedListCommand(const char* args) +bool ChatHandler::HandleCharacterDeletedListCommand(char* args) { DeletedInfoList foundList; if (!GetDeletedCharacterInfoList(foundList, args)) @@ -291,7 +291,7 @@ void ChatHandler::HandleCharacterDeletedRestoreHelper(DeletedInfo const& delInfo * * @param args the search string which either contains a player GUID or a part of the character-name */ -bool ChatHandler::HandleCharacterDeletedRestoreCommand(const char* args) +bool ChatHandler::HandleCharacterDeletedRestoreCommand(char* args) { // It is required to submit at least one argument if (!*args) @@ -356,7 +356,7 @@ bool ChatHandler::HandleCharacterDeletedRestoreCommand(const char* args) * * @param args the search string which either contains a player GUID or a part fo the character-name */ -bool ChatHandler::HandleCharacterDeletedDeleteCommand(const char* args) +bool ChatHandler::HandleCharacterDeletedDeleteCommand(char* args) { // It is required to submit at least one argument if (!*args) @@ -393,12 +393,11 @@ bool ChatHandler::HandleCharacterDeletedDeleteCommand(const char* args) * * @param args the search string which either contains a player GUID or a part fo the character-name */ -bool ChatHandler::HandleCharacterDeletedOldCommand(const char* args) +bool ChatHandler::HandleCharacterDeletedOldCommand(char* args) { int32 keepDays = sWorld.getConfig(CONFIG_UINT32_CHARDELETE_KEEP_DAYS); - char* px = strtok((char*)args, " "); - if (px) + if (char* px = strtok(args, " ")) { if (!isNumeric(px)) return false; @@ -415,12 +414,12 @@ bool ChatHandler::HandleCharacterDeletedOldCommand(const char* args) return true; } -bool ChatHandler::HandleCharacterEraseCommand(const char* args) +bool ChatHandler::HandleCharacterEraseCommand(char* args) { - if(!*args) + if (!*args) return false; - char *character_name_str = strtok((char*)args," "); + char *character_name_str = strtok(args," "); if(!character_name_str) return false; @@ -431,8 +430,7 @@ bool ChatHandler::HandleCharacterEraseCommand(const char* args) uint64 character_guid; uint32 account_id; - Player *player = sObjectMgr.GetPlayer(character_name.c_str()); - if(player) + if (Player *player = sObjectMgr.GetPlayer(character_name.c_str())) { character_guid = player->GetGUID(); account_id = player->GetSession()->GetAccountId(); @@ -460,7 +458,7 @@ bool ChatHandler::HandleCharacterEraseCommand(const char* args) } /// Close RA connection -bool ChatHandler::HandleQuitCommand(const char* /*args*/) +bool ChatHandler::HandleQuitCommand(char* /*args*/) { // processed in RASocket SendSysMessage(LANG_QUIT_WRONG_USE_ERROR); @@ -468,7 +466,7 @@ bool ChatHandler::HandleQuitCommand(const char* /*args*/) } /// Exit the realm -bool ChatHandler::HandleServerExitCommand(const char* /*args*/) +bool ChatHandler::HandleServerExitCommand(char* /*args*/) { SendSysMessage(LANG_COMMAND_EXIT); World::StopNow(SHUTDOWN_EXIT_CODE); @@ -476,10 +474,10 @@ bool ChatHandler::HandleServerExitCommand(const char* /*args*/) } /// Display info on users currently in the realm -bool ChatHandler::HandleAccountOnlineListCommand(const char* args) +bool ChatHandler::HandleAccountOnlineListCommand(char* args) { - char* limit_str = *args ? strtok((char*)args, " ") : NULL; - uint32 limit = limit_str ? atoi (limit_str) : 100; + char* limit_str = *args ? strtok(args, " ") : NULL; + uint32 limit = limit_str ? atoi(limit_str) : 100; ///- Get the list of accounts ID logged to the realm // 0 1 2 3 4 @@ -489,13 +487,13 @@ bool ChatHandler::HandleAccountOnlineListCommand(const char* args) } /// Create an account -bool ChatHandler::HandleAccountCreateCommand(const char* args) +bool ChatHandler::HandleAccountCreateCommand(char* args) { - if(!*args) + if (!*args) return false; ///- %Parse the command line arguments - char *szAcc = strtok((char*)args, " "); + char *szAcc = strtok(args, " "); char *szPassword = strtok(NULL, " "); if(!szAcc || !szPassword) return false; @@ -532,9 +530,9 @@ bool ChatHandler::HandleAccountCreateCommand(const char* args) } /// Set the filters of logging -bool ChatHandler::HandleServerLogFilterCommand(const char* args) +bool ChatHandler::HandleServerLogFilterCommand(char* args) { - if(!*args) + if (!*args) { uint32 logfiler = sLog.getLogFilter(); @@ -545,7 +543,7 @@ bool ChatHandler::HandleServerLogFilterCommand(const char* args) return true; } - char *filtername = strtok((char*)args, " "); + char *filtername = strtok(args, " "); if (!filtername) return false; @@ -589,15 +587,15 @@ bool ChatHandler::HandleServerLogFilterCommand(const char* args) } /// Set the level of logging -bool ChatHandler::HandleServerLogLevelCommand(const char *args) +bool ChatHandler::HandleServerLogLevelCommand(char *args) { - if(!*args) + if (!*args) { PSendSysMessage("Log level: %u", sLog.GetLogLevel()); return true; } - sLog.SetLogLevel((char*)args); + sLog.SetLogLevel(args); return true; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a75d4bbaa..772b8c7ff 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10321" + #define REVISION_NR "10322" #endif // __REVISION_NR_H__