diff options
Diffstat (limited to 'src/game/Level3.cpp')
| -rw-r--r-- | src/game/Level3.cpp | 300 |
1 files changed, 150 insertions, 150 deletions
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index c237bccf4e5..fcbdb9118c7 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -588,7 +588,7 @@ bool ChatHandler::HandleReloadAllAreaCommand(const char*) bool ChatHandler::HandleReloadAllLootCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables..." ); + sLog.outString("Re-Loading Loot Tables..."); LoadLootTables(); SendGlobalGMSysMessage("DB tables `*_loot_template` reloaded."); return true; @@ -609,7 +609,7 @@ bool ChatHandler::HandleReloadAllQuestCommand(const char* /*args*/) HandleReloadQuestAreaTriggersCommand("a"); HandleReloadQuestTemplateCommand("a"); - sLog.outString( "Re-Loading Quests Relations..." ); + sLog.outString("Re-Loading Quests Relations..."); objmgr.LoadQuestRelations(); SendGlobalGMSysMessage("DB tables `*_questrelation` and `*_involvedrelation` reloaded."); return true; @@ -624,7 +624,7 @@ bool ChatHandler::HandleReloadAllScriptsCommand(const char*) return false; } - sLog.outString( "Re-Loading Scripts..." ); + sLog.outString("Re-Loading Scripts..."); HandleReloadGameObjectScriptsCommand("a"); HandleReloadEventScriptsCommand("a"); HandleReloadQuestEndScriptsCommand("a"); @@ -687,7 +687,7 @@ bool ChatHandler::HandleReloadAllLocalesCommand(const char* /*args*/) bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/) { - sLog.outString( "Re-Loading config settings..." ); + sLog.outString("Re-Loading config settings..."); sWorld.LoadConfigSettings(true); MapManager::Instance().InitializeVisibilityDistanceInfo(); SendGlobalGMSysMessage("World config settings reloaded."); @@ -696,7 +696,7 @@ bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/) bool ChatHandler::HandleReloadAccessRequirementCommand(const char*) { - sLog.outString( "Re-Loading Access Requirement definitions..." ); + sLog.outString("Re-Loading Access Requirement definitions..."); objmgr.LoadAccessRequirements(); SendGlobalGMSysMessage("DB table `access_requirement` reloaded."); return true; @@ -704,7 +704,7 @@ bool ChatHandler::HandleReloadAccessRequirementCommand(const char*) bool ChatHandler::HandleReloadAchievementCriteriaDataCommand(const char*) { - sLog.outString( "Re-Loading Additional Achievement Criteria Data..." ); + sLog.outString("Re-Loading Additional Achievement Criteria Data..."); achievementmgr.LoadAchievementCriteriaData(); SendGlobalGMSysMessage("DB table `achievement_criteria_data` reloaded."); return true; @@ -712,7 +712,7 @@ bool ChatHandler::HandleReloadAchievementCriteriaDataCommand(const char*) bool ChatHandler::HandleReloadAchievementRewardCommand(const char*) { - sLog.outString( "Re-Loading Achievement Reward Data..." ); + sLog.outString("Re-Loading Achievement Reward Data..."); achievementmgr.LoadRewards(); SendGlobalGMSysMessage("DB table `achievement_reward` reloaded."); return true; @@ -720,7 +720,7 @@ bool ChatHandler::HandleReloadAchievementRewardCommand(const char*) bool ChatHandler::HandleReloadAreaTriggerTavernCommand(const char*) { - sLog.outString( "Re-Loading Tavern Area Triggers..." ); + sLog.outString("Re-Loading Tavern Area Triggers..."); objmgr.LoadTavernAreaTriggers(); SendGlobalGMSysMessage("DB table `areatrigger_tavern` reloaded."); return true; @@ -728,7 +728,7 @@ bool ChatHandler::HandleReloadAreaTriggerTavernCommand(const char*) bool ChatHandler::HandleReloadAreaTriggerTeleportCommand(const char*) { - sLog.outString( "Re-Loading AreaTrigger teleport definitions..." ); + sLog.outString("Re-Loading AreaTrigger teleport definitions..."); objmgr.LoadAreaTriggerTeleports(); SendGlobalGMSysMessage("DB table `areatrigger_teleport` reloaded."); return true; @@ -751,7 +751,7 @@ bool ChatHandler::HandleReloadCommandCommand(const char*) bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*) { - sLog.outString( "Loading Quests Relations... (`creature_questrelation`)" ); + sLog.outString("Loading Quests Relations... (`creature_questrelation`)"); objmgr.LoadCreatureQuestRelations(); SendGlobalGMSysMessage("DB table `creature_questrelation` (creature quest givers) reloaded."); return true; @@ -759,7 +759,7 @@ bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*) bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char *args) { - sLog.outString( "Loading Linked Respawns... (`creature_linked_respawn`)" ); + sLog.outString("Loading Linked Respawns... (`creature_linked_respawn`)"); objmgr.LoadCreatureLinkedRespawn(); SendGlobalGMSysMessage("DB table `creature_linked_respawn` (creature linked respawns) reloaded."); return true; @@ -767,7 +767,7 @@ bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char *args) bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(const char*) { - sLog.outString( "Loading Quests Relations... (`creature_involvedrelation`)" ); + sLog.outString("Loading Quests Relations... (`creature_involvedrelation`)"); objmgr.LoadCreatureInvolvedRelations(); SendGlobalGMSysMessage("DB table `creature_involvedrelation` (creature quest takers) reloaded."); return true; @@ -775,7 +775,7 @@ bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(const char*) bool ChatHandler::HandleReloadGossipMenuCommand(const char*) { - sLog.outString( "Re-Loading `gossip_menu` Table!" ); + sLog.outString("Re-Loading `gossip_menu` Table!"); objmgr.LoadGossipMenu(); SendGlobalSysMessage("DB table `gossip_menu` reloaded."); return true; @@ -783,7 +783,7 @@ bool ChatHandler::HandleReloadGossipMenuCommand(const char*) bool ChatHandler::HandleReloadGossipMenuOptionCommand(const char*) { - sLog.outString( "Re-Loading `gossip_menu_option` Table!" ); + sLog.outString("Re-Loading `gossip_menu_option` Table!"); objmgr.LoadGossipMenuItems(); SendGlobalSysMessage("DB table `gossip_menu_option` reloaded."); return true; @@ -791,7 +791,7 @@ bool ChatHandler::HandleReloadGossipMenuOptionCommand(const char*) bool ChatHandler::HandleReloadGOQuestRelationsCommand(const char*) { - sLog.outString( "Loading Quests Relations... (`gameobject_questrelation`)" ); + sLog.outString("Loading Quests Relations... (`gameobject_questrelation`)"); objmgr.LoadGameobjectQuestRelations(); SendGlobalGMSysMessage("DB table `gameobject_questrelation` (gameobject quest givers) reloaded."); return true; @@ -799,7 +799,7 @@ bool ChatHandler::HandleReloadGOQuestRelationsCommand(const char*) bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(const char*) { - sLog.outString( "Loading Quests Relations... (`gameobject_involvedrelation`)" ); + sLog.outString("Loading Quests Relations... (`gameobject_involvedrelation`)"); objmgr.LoadGameobjectInvolvedRelations(); SendGlobalGMSysMessage("DB table `gameobject_involvedrelation` (gameobject quest takers) reloaded."); return true; @@ -807,7 +807,7 @@ bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(const char*) bool ChatHandler::HandleReloadQuestAreaTriggersCommand(const char*) { - sLog.outString( "Re-Loading Quest Area Triggers..." ); + sLog.outString("Re-Loading Quest Area Triggers..."); objmgr.LoadQuestAreaTriggers(); SendGlobalGMSysMessage("DB table `areatrigger_involvedrelation` (quest area triggers) reloaded."); return true; @@ -815,12 +815,12 @@ bool ChatHandler::HandleReloadQuestAreaTriggersCommand(const char*) bool ChatHandler::HandleReloadQuestTemplateCommand(const char*) { - sLog.outString( "Re-Loading Quest Templates..." ); + sLog.outString("Re-Loading Quest Templates..."); objmgr.LoadQuests(); SendGlobalGMSysMessage("DB table `quest_template` (quest definitions) reloaded."); /// dependent also from `gameobject` but this table not reloaded anyway - sLog.outString( "Re-Loading GameObjects for quests..." ); + sLog.outString("Re-Loading GameObjects for quests..."); objmgr.LoadGameObjectForQuests(); SendGlobalGMSysMessage("Data GameObjects for quests reloaded."); return true; @@ -828,7 +828,7 @@ bool ChatHandler::HandleReloadQuestTemplateCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesCreatureCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`creature_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`creature_loot_template`)"); LoadLootTemplates_Creature(); LootTemplates_Creature.CheckLootRefs(); SendGlobalGMSysMessage("DB table `creature_loot_template` reloaded."); @@ -837,7 +837,7 @@ bool ChatHandler::HandleReloadLootTemplatesCreatureCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesDisenchantCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`disenchant_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`disenchant_loot_template`)"); LoadLootTemplates_Disenchant(); LootTemplates_Disenchant.CheckLootRefs(); SendGlobalGMSysMessage("DB table `disenchant_loot_template` reloaded."); @@ -846,7 +846,7 @@ bool ChatHandler::HandleReloadLootTemplatesDisenchantCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesFishingCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`fishing_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`fishing_loot_template`)"); LoadLootTemplates_Fishing(); LootTemplates_Fishing.CheckLootRefs(); SendGlobalGMSysMessage("DB table `fishing_loot_template` reloaded."); @@ -855,7 +855,7 @@ bool ChatHandler::HandleReloadLootTemplatesFishingCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesGameobjectCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`gameobject_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`gameobject_loot_template`)"); LoadLootTemplates_Gameobject(); LootTemplates_Gameobject.CheckLootRefs(); SendGlobalGMSysMessage("DB table `gameobject_loot_template` reloaded."); @@ -864,7 +864,7 @@ bool ChatHandler::HandleReloadLootTemplatesGameobjectCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesItemCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`item_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`item_loot_template`)"); LoadLootTemplates_Item(); LootTemplates_Item.CheckLootRefs(); SendGlobalGMSysMessage("DB table `item_loot_template` reloaded."); @@ -873,7 +873,7 @@ bool ChatHandler::HandleReloadLootTemplatesItemCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesMillingCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`milling_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`milling_loot_template`)"); LoadLootTemplates_Milling(); LootTemplates_Milling.CheckLootRefs(); SendGlobalGMSysMessage("DB table `milling_loot_template` reloaded."); @@ -882,7 +882,7 @@ bool ChatHandler::HandleReloadLootTemplatesMillingCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesPickpocketingCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`pickpocketing_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`pickpocketing_loot_template`)"); LoadLootTemplates_Pickpocketing(); LootTemplates_Pickpocketing.CheckLootRefs(); SendGlobalGMSysMessage("DB table `pickpocketing_loot_template` reloaded."); @@ -891,7 +891,7 @@ bool ChatHandler::HandleReloadLootTemplatesPickpocketingCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesProspectingCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`prospecting_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`prospecting_loot_template`)"); LoadLootTemplates_Prospecting(); LootTemplates_Prospecting.CheckLootRefs(); SendGlobalGMSysMessage("DB table `prospecting_loot_template` reloaded."); @@ -900,7 +900,7 @@ bool ChatHandler::HandleReloadLootTemplatesProspectingCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesMailCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`mail_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`mail_loot_template`)"); LoadLootTemplates_Mail(); LootTemplates_Mail.CheckLootRefs(); SendGlobalSysMessage("DB table `mail_loot_template` reloaded."); @@ -909,7 +909,7 @@ bool ChatHandler::HandleReloadLootTemplatesMailCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesReferenceCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`reference_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`reference_loot_template`)"); LoadLootTemplates_Reference(); SendGlobalGMSysMessage("DB table `reference_loot_template` reloaded."); return true; @@ -917,7 +917,7 @@ bool ChatHandler::HandleReloadLootTemplatesReferenceCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesSkinningCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`skinning_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`skinning_loot_template`)"); LoadLootTemplates_Skinning(); LootTemplates_Skinning.CheckLootRefs(); SendGlobalGMSysMessage("DB table `skinning_loot_template` reloaded."); @@ -926,7 +926,7 @@ bool ChatHandler::HandleReloadLootTemplatesSkinningCommand(const char*) bool ChatHandler::HandleReloadLootTemplatesSpellCommand(const char*) { - sLog.outString( "Re-Loading Loot Tables... (`spell_loot_template`)" ); + sLog.outString("Re-Loading Loot Tables... (`spell_loot_template`)"); LoadLootTemplates_Spell(); LootTemplates_Spell.CheckLootRefs(); SendGlobalGMSysMessage("DB table `spell_loot_template` reloaded."); @@ -935,7 +935,7 @@ bool ChatHandler::HandleReloadLootTemplatesSpellCommand(const char*) bool ChatHandler::HandleReloadTrinityStringCommand(const char*) { - sLog.outString( "Re-Loading trinity_string Table!" ); + sLog.outString("Re-Loading trinity_string Table!"); objmgr.LoadTrinityStrings(); SendGlobalGMSysMessage("DB table `trinity_string` reloaded."); return true; @@ -943,7 +943,7 @@ bool ChatHandler::HandleReloadTrinityStringCommand(const char*) bool ChatHandler::HandleReloadNpcGossipCommand(const char*) { - sLog.outString( "Re-Loading `npc_gossip` Table!" ); + sLog.outString("Re-Loading `npc_gossip` Table!"); objmgr.LoadNpcTextId(); SendGlobalGMSysMessage("DB table `npc_gossip` reloaded."); return true; @@ -951,7 +951,7 @@ bool ChatHandler::HandleReloadNpcGossipCommand(const char*) bool ChatHandler::HandleReloadNpcTrainerCommand(const char*) { - sLog.outString( "Re-Loading `npc_trainer` Table!" ); + sLog.outString("Re-Loading `npc_trainer` Table!"); objmgr.LoadTrainerSpell(); SendGlobalGMSysMessage("DB table `npc_trainer` reloaded."); return true; @@ -959,7 +959,7 @@ bool ChatHandler::HandleReloadNpcTrainerCommand(const char*) bool ChatHandler::HandleReloadNpcVendorCommand(const char*) { - sLog.outString( "Re-Loading `npc_vendor` Table!" ); + sLog.outString("Re-Loading `npc_vendor` Table!"); objmgr.LoadVendors(); SendGlobalGMSysMessage("DB table `npc_vendor` reloaded."); return true; @@ -967,7 +967,7 @@ bool ChatHandler::HandleReloadNpcVendorCommand(const char*) bool ChatHandler::HandleReloadPointsOfInterestCommand(const char*) { - sLog.outString( "Re-Loading `points_of_interest` Table!" ); + sLog.outString("Re-Loading `points_of_interest` Table!"); objmgr.LoadPointsOfInterest(); SendGlobalGMSysMessage("DB table `points_of_interest` reloaded."); return true; @@ -975,7 +975,7 @@ bool ChatHandler::HandleReloadPointsOfInterestCommand(const char*) bool ChatHandler::HandleReloadSpellClickSpellsCommand(const char*) { - sLog.outString( "Re-Loading `npc_spellclick_spells` Table!" ); + sLog.outString("Re-Loading `npc_spellclick_spells` Table!"); objmgr.LoadNPCSpellClickSpells(); SendGlobalGMSysMessage("DB table `npc_spellclick_spells` reloaded."); return true; @@ -983,7 +983,7 @@ bool ChatHandler::HandleReloadSpellClickSpellsCommand(const char*) bool ChatHandler::HandleReloadReservedNameCommand(const char*) { - sLog.outString( "Loading ReservedNames... (`reserved_name`)" ); + sLog.outString("Loading ReservedNames... (`reserved_name`)"); objmgr.LoadReservedPlayersNames(); SendGlobalGMSysMessage("DB table `reserved_name` (player reserved names) reloaded."); return true; @@ -991,7 +991,7 @@ bool ChatHandler::HandleReloadReservedNameCommand(const char*) bool ChatHandler::HandleReloadSkillDiscoveryTemplateCommand(const char* /*args*/) { - sLog.outString( "Re-Loading Skill Discovery Table..." ); + sLog.outString("Re-Loading Skill Discovery Table..."); LoadSkillDiscoveryTable(); SendGlobalGMSysMessage("DB table `skill_discovery_template` (recipes discovered at crafting) reloaded."); return true; @@ -999,7 +999,7 @@ bool ChatHandler::HandleReloadSkillDiscoveryTemplateCommand(const char* /*args*/ bool ChatHandler::HandleReloadSkillExtraItemTemplateCommand(const char* /*args*/) { - sLog.outString( "Re-Loading Skill Extra Item Table..." ); + sLog.outString("Re-Loading Skill Extra Item Table..."); LoadSkillExtraItemTable(); SendGlobalGMSysMessage("DB table `skill_extra_item_template` (extra item creation when crafting) reloaded."); return true; @@ -1007,7 +1007,7 @@ bool ChatHandler::HandleReloadSkillExtraItemTemplateCommand(const char* /*args*/ bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(const char* /*args*/) { - sLog.outString( "Re-Loading Skill Fishing base level requirements..." ); + sLog.outString("Re-Loading Skill Fishing base level requirements..."); objmgr.LoadFishingBaseSkillLevel(); SendGlobalGMSysMessage("DB table `skill_fishing_base_level` (fishing base level for zone/subzone) reloaded."); return true; @@ -1015,7 +1015,7 @@ bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(const char* /*args*/) bool ChatHandler::HandleReloadSpellAreaCommand(const char*) { - sLog.outString( "Re-Loading SpellArea Data..." ); + sLog.outString("Re-Loading SpellArea Data..."); spellmgr.LoadSpellAreas(); SendGlobalGMSysMessage("DB table `spell_area` (spell dependences from area/quest/auras state) reloaded."); return true; @@ -1023,7 +1023,7 @@ bool ChatHandler::HandleReloadSpellAreaCommand(const char*) bool ChatHandler::HandleReloadSpellRequiredCommand(const char*) { - sLog.outString( "Re-Loading Spell Required Data... " ); + sLog.outString("Re-Loading Spell Required Data... "); spellmgr.LoadSpellRequired(); SendGlobalGMSysMessage("DB table `spell_required` reloaded."); return true; @@ -1031,7 +1031,7 @@ bool ChatHandler::HandleReloadSpellRequiredCommand(const char*) bool ChatHandler::HandleReloadSpellGroupsCommand(const char*) { - sLog.outString( "Re-Loading Spell Groups..." ); + sLog.outString("Re-Loading Spell Groups..."); spellmgr.LoadSpellGroups(); SendGlobalGMSysMessage("DB table `spell_group` (spell elixir types) reloaded."); return true; @@ -1039,7 +1039,7 @@ bool ChatHandler::HandleReloadSpellGroupsCommand(const char*) bool ChatHandler::HandleReloadSpellLearnSpellCommand(const char*) { - sLog.outString( "Re-Loading Spell Learn Spells..." ); + sLog.outString("Re-Loading Spell Learn Spells..."); spellmgr.LoadSpellLearnSpells(); SendGlobalGMSysMessage("DB table `spell_learn_spell` reloaded."); return true; @@ -1047,7 +1047,7 @@ bool ChatHandler::HandleReloadSpellLearnSpellCommand(const char*) bool ChatHandler::HandleReloadSpellLinkedSpellCommand(const char*) { - sLog.outString( "Re-Loading Spell Linked Spells..." ); + sLog.outString("Re-Loading Spell Linked Spells..."); spellmgr.LoadSpellLinked(); SendGlobalGMSysMessage("DB table `spell_linked_spell` reloaded."); return true; @@ -1055,7 +1055,7 @@ bool ChatHandler::HandleReloadSpellLinkedSpellCommand(const char*) bool ChatHandler::HandleReloadSpellProcEventCommand(const char*) { - sLog.outString( "Re-Loading Spell Proc Event conditions..." ); + sLog.outString("Re-Loading Spell Proc Event conditions..."); spellmgr.LoadSpellProcEvents(); SendGlobalGMSysMessage("DB table `spell_proc_event` (spell proc trigger requirements) reloaded."); return true; @@ -1063,7 +1063,7 @@ bool ChatHandler::HandleReloadSpellProcEventCommand(const char*) bool ChatHandler::HandleReloadSpellBonusesCommand(const char*) { - sLog.outString( "Re-Loading Spell Bonus Data..." ); + sLog.outString("Re-Loading Spell Bonus Data..."); spellmgr.LoadSpellBonusess(); SendGlobalGMSysMessage("DB table `spell_bonus_data` (spell damage/healing coefficients) reloaded."); return true; @@ -1071,7 +1071,7 @@ bool ChatHandler::HandleReloadSpellBonusesCommand(const char*) bool ChatHandler::HandleReloadSpellScriptTargetCommand(const char*) { - sLog.outString( "Re-Loading SpellsScriptTarget..." ); + sLog.outString("Re-Loading SpellsScriptTarget..."); spellmgr.LoadSpellScriptTarget(); SendGlobalGMSysMessage("DB table `spell_script_target` (spell targets selection in case specific creature/GO requirements) reloaded."); return true; @@ -1079,7 +1079,7 @@ bool ChatHandler::HandleReloadSpellScriptTargetCommand(const char*) bool ChatHandler::HandleReloadSpellTargetPositionCommand(const char*) { - sLog.outString( "Re-Loading Spell target coordinates..." ); + sLog.outString("Re-Loading Spell target coordinates..."); spellmgr.LoadSpellTargetPositions(); SendGlobalGMSysMessage("DB table `spell_target_position` (destination coordinates for spell targets) reloaded."); return true; @@ -1087,7 +1087,7 @@ bool ChatHandler::HandleReloadSpellTargetPositionCommand(const char*) bool ChatHandler::HandleReloadSpellThreatsCommand(const char*) { - sLog.outString( "Re-Loading Aggro Spells Definitions..."); + sLog.outString("Re-Loading Aggro Spells Definitions..."); spellmgr.LoadSpellThreats(); SendGlobalGMSysMessage("DB table `spell_threat` (spell aggro definitions) reloaded."); return true; @@ -1095,7 +1095,7 @@ bool ChatHandler::HandleReloadSpellThreatsCommand(const char*) bool ChatHandler::HandleReloadSpellGroupStackRulesCommand(const char*) { - sLog.outString( "Re-Loading Spell Group Stack Rules..." ); + sLog.outString("Re-Loading Spell Group Stack Rules..."); spellmgr.LoadSpellGroupStackRules(); SendGlobalGMSysMessage("DB table `spell_group_stack_rules` (spell stacking definitions) reloaded."); return true; @@ -1103,7 +1103,7 @@ bool ChatHandler::HandleReloadSpellGroupStackRulesCommand(const char*) bool ChatHandler::HandleReloadSpellPetAurasCommand(const char*) { - sLog.outString( "Re-Loading Spell pet auras..."); + sLog.outString("Re-Loading Spell pet auras..."); spellmgr.LoadSpellPetAuras(); SendGlobalGMSysMessage("DB table `spell_pet_auras` reloaded."); return true; @@ -1111,7 +1111,7 @@ bool ChatHandler::HandleReloadSpellPetAurasCommand(const char*) bool ChatHandler::HandleReloadPageTextsCommand(const char*) { - sLog.outString( "Re-Loading Page Texts..." ); + sLog.outString("Re-Loading Page Texts..."); objmgr.LoadPageTexts(); SendGlobalGMSysMessage("DB table `page_texts` reloaded."); return true; @@ -1119,7 +1119,7 @@ bool ChatHandler::HandleReloadPageTextsCommand(const char*) bool ChatHandler::HandleReloadItemEnchantementsCommand(const char*) { - sLog.outString( "Re-Loading Item Random Enchantments Table..." ); + sLog.outString("Re-Loading Item Random Enchantments Table..."); LoadRandomEnchantmentsTable(); SendGlobalGMSysMessage("DB table `item_enchantment_template` reloaded."); return true; @@ -1127,7 +1127,7 @@ bool ChatHandler::HandleReloadItemEnchantementsCommand(const char*) bool ChatHandler::HandleReloadItemRequiredTragetCommand(const char*) { - sLog.outString( "Re-Loading Item Required Targets Table..." ); + sLog.outString("Re-Loading Item Required Targets Table..."); objmgr.LoadItemRequiredTarget(); SendGlobalGMSysMessage("DB table `item_required_target` reloaded."); return true; @@ -1143,7 +1143,7 @@ bool ChatHandler::HandleReloadGameObjectScriptsCommand(const char* arg) } if (*arg!='a') - sLog.outString( "Re-Loading Scripts from `gameobject_scripts`..."); + sLog.outString("Re-Loading Scripts from `gameobject_scripts`..."); objmgr.LoadGameObjectScripts(); @@ -1163,7 +1163,7 @@ bool ChatHandler::HandleReloadEventScriptsCommand(const char* arg) } if (*arg!='a') - sLog.outString( "Re-Loading Scripts from `event_scripts`..."); + sLog.outString("Re-Loading Scripts from `event_scripts`..."); objmgr.LoadEventScripts(); @@ -1183,7 +1183,7 @@ bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg) } if (*arg!='a') - sLog.outString( "Re-Loading Scripts from `waypoint_scripts`..."); + sLog.outString("Re-Loading Scripts from `waypoint_scripts`..."); objmgr.LoadWaypointScripts(); @@ -1196,7 +1196,7 @@ bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg) bool ChatHandler::HandleReloadEventAITextsCommand(const char* arg) { - sLog.outString( "Re-Loading Texts from `creature_ai_texts`..."); + sLog.outString("Re-Loading Texts from `creature_ai_texts`..."); CreatureEAI_Mgr.LoadCreatureEventAI_Texts(); SendGlobalGMSysMessage("DB table `creature_ai_texts` reloaded."); return true; @@ -1204,7 +1204,7 @@ bool ChatHandler::HandleReloadEventAITextsCommand(const char* arg) bool ChatHandler::HandleReloadEventAISummonsCommand(const char* arg) { - sLog.outString( "Re-Loading Summons from `creature_ai_summons`..."); + sLog.outString("Re-Loading Summons from `creature_ai_summons`..."); CreatureEAI_Mgr.LoadCreatureEventAI_Summons(); SendGlobalGMSysMessage("DB table `creature_ai_summons` reloaded."); return true; @@ -1212,7 +1212,7 @@ bool ChatHandler::HandleReloadEventAISummonsCommand(const char* arg) bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* arg) { - sLog.outString( "Re-Loading Scripts from `creature_ai_scripts`..."); + sLog.outString("Re-Loading Scripts from `creature_ai_scripts`..."); CreatureEAI_Mgr.LoadCreatureEventAI_Scripts(); SendGlobalGMSysMessage("DB table `creature_ai_scripts` reloaded."); return true; @@ -1228,7 +1228,7 @@ bool ChatHandler::HandleReloadQuestEndScriptsCommand(const char* arg) } if (*arg!='a') - sLog.outString( "Re-Loading Scripts from `quest_end_scripts`..."); + sLog.outString("Re-Loading Scripts from `quest_end_scripts`..."); objmgr.LoadQuestEndScripts(); @@ -1248,7 +1248,7 @@ bool ChatHandler::HandleReloadQuestStartScriptsCommand(const char* arg) } if (*arg!='a') - sLog.outString( "Re-Loading Scripts from `quest_start_scripts`..."); + sLog.outString("Re-Loading Scripts from `quest_start_scripts`..."); objmgr.LoadQuestStartScripts(); @@ -1268,7 +1268,7 @@ bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg) } if (*arg!='a') - sLog.outString( "Re-Loading Scripts from `spell_scripts`..."); + sLog.outString("Re-Loading Scripts from `spell_scripts`..."); objmgr.LoadSpellScripts(); @@ -1280,7 +1280,7 @@ bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg) bool ChatHandler::HandleReloadDbScriptStringCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Script strings from `db_script_string`..."); + sLog.outString("Re-Loading Script strings from `db_script_string`..."); objmgr.LoadDbScriptStrings(); SendGlobalGMSysMessage("DB table `db_script_string` reloaded."); return true; @@ -1288,7 +1288,7 @@ bool ChatHandler::HandleReloadDbScriptStringCommand(const char* /*arg*/) bool ChatHandler::HandleReloadGameGraveyardZoneCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Graveyard-zone links..."); + sLog.outString("Re-Loading Graveyard-zone links..."); objmgr.LoadGraveyardZones(); @@ -1299,7 +1299,7 @@ bool ChatHandler::HandleReloadGameGraveyardZoneCommand(const char* /*arg*/) bool ChatHandler::HandleReloadGameTeleCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Game Tele coordinates..."); + sLog.outString("Re-Loading Game Tele coordinates..."); objmgr.LoadGameTele(); @@ -1310,7 +1310,7 @@ bool ChatHandler::HandleReloadGameTeleCommand(const char* /*arg*/) bool ChatHandler::HandleReloadSpellDisabledCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading spell disabled table..."); + sLog.outString("Re-Loading spell disabled table..."); objmgr.LoadSpellDisabledEntrys(); @@ -1321,7 +1321,7 @@ bool ChatHandler::HandleReloadSpellDisabledCommand(const char* /*arg*/) bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(const char*) { - sLog.outString( "Re-Loading Locales Achievement Reward Data..." ); + sLog.outString("Re-Loading Locales Achievement Reward Data..."); achievementmgr.LoadRewardLocales(); SendGlobalGMSysMessage("DB table `locales_achievement_reward` reloaded."); return true; @@ -1329,7 +1329,7 @@ bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(const char*) bool ChatHandler::HandleReloadLocalesCreatureCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Locales Creature ..."); + sLog.outString("Re-Loading Locales Creature ..."); objmgr.LoadCreatureLocales(); SendGlobalGMSysMessage("DB table `locales_creature` reloaded."); return true; @@ -1337,7 +1337,7 @@ bool ChatHandler::HandleReloadLocalesCreatureCommand(const char* /*arg*/) bool ChatHandler::HandleReloadLocalesGameobjectCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Locales Gameobject ... "); + sLog.outString("Re-Loading Locales Gameobject ... "); objmgr.LoadGameObjectLocales(); SendGlobalGMSysMessage("DB table `locales_gameobject` reloaded."); return true; @@ -1345,7 +1345,7 @@ bool ChatHandler::HandleReloadLocalesGameobjectCommand(const char* /*arg*/) bool ChatHandler::HandleReloadLocalesItemCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Locales Item ... "); + sLog.outString("Re-Loading Locales Item ... "); objmgr.LoadItemLocales(); SendGlobalGMSysMessage("DB table `locales_item` reloaded."); return true; @@ -1353,7 +1353,7 @@ bool ChatHandler::HandleReloadLocalesItemCommand(const char* /*arg*/) bool ChatHandler::HandleReloadLocalesNpcTextCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Locales NPC Text ... "); + sLog.outString("Re-Loading Locales NPC Text ... "); objmgr.LoadNpcTextLocales(); SendGlobalGMSysMessage("DB table `locales_npc_text` reloaded."); return true; @@ -1361,7 +1361,7 @@ bool ChatHandler::HandleReloadLocalesNpcTextCommand(const char* /*arg*/) bool ChatHandler::HandleReloadLocalesPageTextCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Locales Page Text ... "); + sLog.outString("Re-Loading Locales Page Text ... "); objmgr.LoadPageTextLocales(); SendGlobalGMSysMessage("DB table `locales_page_text` reloaded."); return true; @@ -1369,7 +1369,7 @@ bool ChatHandler::HandleReloadLocalesPageTextCommand(const char* /*arg*/) bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Locales Points Of Interest ... "); + sLog.outString("Re-Loading Locales Points Of Interest ... "); objmgr.LoadPointOfInterestLocales(); SendGlobalGMSysMessage("DB table `locales_points_of_interest` reloaded."); return true; @@ -1377,7 +1377,7 @@ bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(const char* /*arg*/ bool ChatHandler::HandleReloadLocalesQuestCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Locales Quest ... "); + sLog.outString("Re-Loading Locales Quest ... "); objmgr.LoadQuestLocales(); SendGlobalGMSysMessage("DB table `locales_quest` reloaded."); return true; @@ -1385,7 +1385,7 @@ bool ChatHandler::HandleReloadLocalesQuestCommand(const char* /*arg*/) bool ChatHandler::HandleReloadMailLevelRewardCommand(const char* /*arg*/) { - sLog.outString( "Re-Loading Player level dependent mail rewards..." ); + sLog.outString("Re-Loading Player level dependent mail rewards..."); objmgr.LoadMailLevelRewards(); SendGlobalSysMessage("DB table `mail_level_reward` reloaded."); return true; @@ -1394,7 +1394,7 @@ bool ChatHandler::HandleReloadMailLevelRewardCommand(const char* /*arg*/) bool ChatHandler::HandleReloadAuctionsCommand(const char *args) { ///- Reload dynamic data tables from the database - sLog.outString( "Re-Loading Auctions..." ); + sLog.outString("Re-Loading Auctions..."); auctionmgr.LoadAuctionItems(); auctionmgr.LoadAuctions(); SendGlobalGMSysMessage("Auctions reloaded."); @@ -2354,7 +2354,7 @@ bool ChatHandler::HandleLearnAllGMCommand(const char* /*args*/) }; uint16 gmSpellIter = 0; - while ( strcmp(gmSpellList[gmSpellIter], "0") ) + while (strcmp(gmSpellList[gmSpellIter], "0")) { uint32 spell = atol((char*)gmSpellList[gmSpellIter++]); @@ -2401,12 +2401,12 @@ bool ChatHandler::HandleLearnAllMySpellsCommand(const char* /*args*/) continue; // skip other spell families - if ( spellInfo->SpellFamilyName != family) + if (spellInfo->SpellFamilyName != family) continue; // skip spells with first rank learned as talent (and all talents then also) uint32 first_rank = spellmgr.GetFirstSpellInChain(spellInfo->Id); - if (GetTalentSpellCost(first_rank) > 0 ) + if (GetTalentSpellCost(first_rank) > 0) continue; // skip broken spells @@ -2431,11 +2431,11 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/) if (!talentInfo) continue; - TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab ); + TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry(talentInfo->TalentTab); if (!talentTabInfo) continue; - if ( (classMask & talentTabInfo->ClassMask) == 0 ) + if ((classMask & talentTabInfo->ClassMask) == 0) continue; // search highest talent rank @@ -2508,7 +2508,7 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) if (!talentInfo) continue; - TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab ); + TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry(talentInfo->TalentTab); if (!talentTabInfo) continue; @@ -2690,24 +2690,24 @@ bool ChatHandler::HandleAddItemCommand(const char *args) // check space and find places ItemPosCountVec dest; - uint8 msg = plTarget->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemId, count, &noSpaceForCount ); - if ( msg != EQUIP_ERR_OK ) // convert to possible store amount + uint8 msg = plTarget->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, count, &noSpaceForCount); + if (msg != EQUIP_ERR_OK) // convert to possible store amount count -= noSpaceForCount; - if ( count == 0 || dest.empty()) // can't add any + if (count == 0 || dest.empty()) // can't add any { - PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount ); + PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount); SetSentErrorMessage(true); return false; } - Item* item = plTarget->StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId)); + Item* item = plTarget->StoreNewItem(dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId)); // remove binding (let GM give it to another player later) if (pl==plTarget) for (ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr) if (Item* item1 = pl->GetItemByPos(itr->pos)) - item1->SetBinding( false ); + item1->SetBinding(false); if (count > 0 && item) { @@ -2759,14 +2759,14 @@ bool ChatHandler::HandleAddItemSetCommand(const char *args) { found = true; ItemPosCountVec dest; - uint8 msg = plTarget->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, pProto->ItemId, 1 ); + uint8 msg = plTarget->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, pProto->ItemId, 1); if (msg == EQUIP_ERR_OK) { - Item* item = plTarget->StoreNewItem( dest, pProto->ItemId, true); + Item* item = plTarget->StoreNewItem(dest, pProto->ItemId, true); // remove binding (let GM give it to another player later) if (pl==plTarget) - item->SetBinding( false ); + item->SetBinding(false); pl->SendNewItem(item,1,false,true); if (pl!=plTarget) @@ -2774,7 +2774,7 @@ bool ChatHandler::HandleAddItemSetCommand(const char *args) } else { - pl->SendEquipError( msg, NULL, NULL ); + pl->SendEquipError(msg, NULL, NULL); PSendSysMessage(LANG_ITEM_CANNOT_CREATE, pProto->ItemId, 1); } } @@ -3220,7 +3220,7 @@ bool ChatHandler::HandleLookupItemCommand(const char *args) continue; int loc_idx = GetSessionDbLocaleIndex(); - if ( loc_idx >= 0 ) + if (loc_idx >= 0) { ItemLocale const *il = objmgr.GetItemLocale(pProto->ItemId); if (il) @@ -3279,7 +3279,7 @@ bool ChatHandler::HandleLookupItemSetCommand(const char *args) return false; // converting string that we try to find to lower case - wstrToLower( wnamepart ); + wstrToLower(wnamepart); bool found = false; @@ -3344,7 +3344,7 @@ bool ChatHandler::HandleLookupSkillCommand(const char *args) return false; // converting string that we try to find to lower case - wstrToLower( wnamepart ); + wstrToLower(wnamepart); bool found = false; @@ -3423,7 +3423,7 @@ bool ChatHandler::HandleLookupSpellCommand(const char *args) return false; // converting string that we try to find to lower case - wstrToLower( wnamepart ); + wstrToLower(wnamepart); bool found = false; @@ -3534,7 +3534,7 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args) Quest * qinfo = iter->second; int loc_idx = GetSessionDbLocaleIndex(); - if ( loc_idx >= 0 ) + if (loc_idx >= 0) { QuestLocale const *il = objmgr.GetQuestLocale(qinfo->GetQuestId()); if (il) @@ -3701,14 +3701,14 @@ bool ChatHandler::HandleLookupObjectCommand(const char *args) bool found = false; - for (uint32 id = 0; id< sGOStorage.MaxEntry; id++ ) + for (uint32 id = 0; id< sGOStorage.MaxEntry; id++) { GameObjectInfo const* gInfo = sGOStorage.LookupEntry<GameObjectInfo>(id); if (!gInfo) continue; int loc_idx = GetSessionDbLocaleIndex(); - if ( loc_idx >= 0 ) + if (loc_idx >= 0) { GameObjectLocale const *gl = objmgr.GetGameObjectLocale(id); if (gl) @@ -3861,7 +3861,7 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) return false; // converting string that we try to find to lower case - wstrToLower( wnamepart ); + wstrToLower(wnamepart); bool found = false; @@ -4215,7 +4215,7 @@ bool ChatHandler::HandleDieCommand(const char* /*args*/) return false; } - if ( target->isAlive() ) + if (target->isAlive()) { if (sWorld.getConfig(CONFIG_DIE_COMMAND_MODE)) m_session->GetPlayer()->Kill(target); @@ -4270,7 +4270,7 @@ bool ChatHandler::HandleDamageCommand(const char * args) SpellSchoolMask schoolmask = SpellSchoolMask(1 << school); - if ( schoolmask & SPELL_SCHOOL_MASK_NORMAL ) + if (schoolmask & SPELL_SCHOOL_MASK_NORMAL) damage = m_session->GetPlayer()->CalcArmorReducedDamage(target, damage, NULL, BASE_ATTACK); char* spellStr = strtok((char*)NULL, " "); @@ -4360,7 +4360,7 @@ 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); - if (SpellEntry const *spellInfo = sSpellStore.LookupEntry( spellID )) + if (SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID)) Aura::TryCreate(spellInfo, target, target); return true; @@ -4419,7 +4419,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); @@ -4431,7 +4431,7 @@ 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); @@ -4590,11 +4590,11 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/) if (CreatureInfo const *master = GetCreatureInfo(linked->id)) PSendSysMessage(LANG_NPCINFO_LINKGUID, objmgr.GetLinkedRespawnGuid(target->GetDBTableGUIDLow()), linked->id, master->Name); - if ((npcflags & UNIT_NPC_FLAG_VENDOR) ) + if ((npcflags & UNIT_NPC_FLAG_VENDOR)) { SendSysMessage(LANG_NPCINFO_VENDOR); } - if ((npcflags & UNIT_NPC_FLAG_TRAINER) ) + if ((npcflags & UNIT_NPC_FLAG_TRAINER)) { SendSysMessage(LANG_NPCINFO_TRAINER); } @@ -4923,7 +4923,7 @@ bool ChatHandler::HandleHideAreaCommand(const char *args) bool ChatHandler::HandleBankCommand(const char* /*args*/) { - m_session->SendShowBank( m_session->GetPlayer()->GetGUID() ); + m_session->SendShowBank(m_session->GetPlayer()->GetGUID()); return true; } @@ -4997,7 +4997,7 @@ bool ChatHandler::HandleDebugSet32Bit(const char *args) sLog.outDebug(GetTrinityString(LANG_SET_32BIT), Opcode, Value); uint32 iValue = Value ? 1 << (Value - 1) : 0; - target->SetUInt32Value( Opcode , iValue); + target->SetUInt32Value(Opcode , iValue); PSendSysMessage(LANG_SET_32BIT_FIELD, Opcode, iValue); return true; @@ -5173,18 +5173,18 @@ static bool HandleResetStatsOrLevelHelper(Player* player) if (!player->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT)) player->m_form = FORM_NONE; - player->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, DEFAULT_WORLD_OBJECT_SIZE ); - player->SetFloatValue(UNIT_FIELD_COMBATREACH, DEFAULT_COMBAT_REACH ); + player->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, DEFAULT_WORLD_OBJECT_SIZE); + player->SetFloatValue(UNIT_FIELD_COMBATREACH, DEFAULT_COMBAT_REACH); player->setFactionForRace(player->getRace()); - player->SetUInt32Value(UNIT_FIELD_BYTES_0, ( ( player->getRace() ) | ( player->getClass() << 8 ) | ( player->getGender() << 16 ) | ( powertype << 24 ) ) ); + player->SetUInt32Value(UNIT_FIELD_BYTES_0, ((player->getRace()) | (player->getClass() << 8) | (player->getGender() << 16) | (powertype << 24))); // reset only if player not in some form; if (player->m_form==FORM_NONE) player->InitDisplayIds(); - player->SetByteValue(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP ); + player->SetByteValue(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP); player->SetByteValue(UNIT_FIELD_BYTES_2, 3, player->m_form); player->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); @@ -5192,7 +5192,7 @@ static bool HandleResetStatsOrLevelHelper(Player* player) //-1 is default value player->SetUInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, uint32(-1)); - //player->SetUInt32Value(PLAYER_FIELD_BYTES, 0xEEE00000 ); + //player->SetUInt32Value(PLAYER_FIELD_BYTES, 0xEEE00000); return true; } @@ -5318,7 +5318,7 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) else if (target_guid) { uint32 at_flags = AT_LOGIN_NONE | AT_LOGIN_RESET_PET_TALENTS; - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'",at_flags, GUID_LOPART(target_guid) ); + CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'",at_flags, GUID_LOPART(target_guid)); std::string nameLink = playerLink(target_name); PSendSysMessage(LANG_RESET_TALENTS_OFFLINE,nameLink.c_str()); return true; @@ -5559,12 +5559,12 @@ bool ChatHandler::HandleQuestAdd(const char *args) } // ok, normal (creature/GO starting) quest - if ( player->CanAddQuest( pQuest, true ) ) + if (player->CanAddQuest(pQuest, true)) { - player->AddQuest( pQuest, NULL ); + player->AddQuest(pQuest, NULL); - if ( player->CanCompleteQuest( entry ) ) - player->CompleteQuest( entry ); + if (player->CanCompleteQuest(entry)) + player->CompleteQuest(entry); } return true; @@ -5598,7 +5598,7 @@ bool ChatHandler::HandleQuestRemove(const char *args) } // remove all quest entries for 'entry' from quest log - for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot ) + for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot) { uint32 quest = player->GetQuestSlotQuestId(slot); if (quest==entry) @@ -5606,12 +5606,12 @@ bool ChatHandler::HandleQuestRemove(const char *args) player->SetQuestSlot(slot,0); // we ignore unequippable quest items in this case, its' still be equipped - player->TakeQuestSourceItem( quest, false ); + player->TakeQuestSourceItem(quest, false); } } // set quest status to not started (will updated in DB at next save) - player->SetQuestStatus( entry, QUEST_STATUS_NONE); + player->SetQuestStatus(entry, QUEST_STATUS_NONE); // reset rewarded for restart repeatable quest player->getQuestStatusMap()[entry].m_rewarded = false; @@ -5659,10 +5659,10 @@ bool ChatHandler::HandleQuestComplete(const char *args) 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 ) + uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, id, count-curItemCount); + if (msg == EQUIP_ERR_OK) { - Item* item = player->StoreNewItem( dest, id, true); + Item* item = player->StoreNewItem(dest, id, true); player->SendNewItem(item,count-curItemCount,true,false); } } @@ -5928,7 +5928,7 @@ bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname) time_t unbandate = time_t(fields[3].GetUInt64()); bool active = false; - if (fields[2].GetBool() && (fields[1].GetUInt64() == (uint64)0 ||unbandate >= time(NULL)) ) + if (fields[2].GetBool() && (fields[1].GetUInt64() == (uint64)0 ||unbandate >= time(NULL))) active = true; bool permanent = (fields[1].GetUInt64() == (uint64)0); std::string bantime = permanent?GetTrinityString(LANG_BANINFO_INFINITE):secsToTimeString(fields[1].GetUInt64(), true); @@ -6087,9 +6087,9 @@ bool ChatHandler::HandleBanListHelper(QueryResult_AutoPtr result) aTm_unban->tm_year%100, aTm_unban->tm_mon+1, aTm_unban->tm_mday, aTm_unban->tm_hour, aTm_unban->tm_min, fields2[2].GetString(),fields2[3].GetString()); } - }while ( banInfo->NextRow() ); + }while (banInfo->NextRow()); } - }while ( result->NextRow() ); + }while (result->NextRow()); SendSysMessage("==============================================================================="); } return true; @@ -6109,13 +6109,13 @@ bool ChatHandler::HandleBanListIPCommand(const char *args) { result = loginDatabase.Query ("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned" " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP())" - " ORDER BY unbandate" ); + " ORDER BY unbandate"); } else { - result = loginDatabase.PQuery( "SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned" + result = loginDatabase.PQuery("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned" " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP()) AND ip "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'") - " ORDER BY unbandate",filter.c_str() ); + " ORDER BY unbandate",filter.c_str()); } if (!result) @@ -6146,7 +6146,7 @@ bool ChatHandler::HandleBanListIPCommand(const char *args) Field *fields = result->Fetch(); time_t t_ban = fields[1].GetUInt64(); tm* aTm_ban = localtime(&t_ban); - if ( fields[1].GetUInt64() == fields[2].GetUInt64() ) + if (fields[1].GetUInt64() == fields[2].GetUInt64()) { PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d| permanent |%-15.15s|%-15.15s|", fields[0].GetString(), aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, @@ -6161,7 +6161,7 @@ bool ChatHandler::HandleBanListIPCommand(const char *args) aTm_unban->tm_year%100, aTm_unban->tm_mon+1, aTm_unban->tm_mday, aTm_unban->tm_hour, aTm_unban->tm_min, fields[3].GetString(), fields[4].GetString()); } - }while ( result->NextRow() ); + }while (result->NextRow()); SendSysMessage("==============================================================================="); } @@ -6402,7 +6402,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) return false; } - PSendSysMessage(LANG_MOVEGENS_LIST,(unit->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature" ),unit->GetGUIDLow()); + PSendSysMessage(LANG_MOVEGENS_LIST,(unit->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"),unit->GetGUIDLow()); MotionMaster* mm = unit->GetMotionMaster(); for (uint8 i = 0; i < MAX_MOTION_SLOT; ++i) @@ -6480,16 +6480,16 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args) int l = strlen(param); - if ( strncmp(param,"player",l) == 0 ) + if (strncmp(param,"player",l) == 0) sWorld.SetPlayerLimit(-SEC_PLAYER); - else if (strncmp(param,"moderator",l) == 0 ) + else if (strncmp(param,"moderator",l) == 0) sWorld.SetPlayerLimit(-SEC_MODERATOR); - else if (strncmp(param,"gamemaster",l) == 0 ) + else if (strncmp(param,"gamemaster",l) == 0) sWorld.SetPlayerLimit(-SEC_GAMEMASTER); - else if (strncmp(param,"administrator",l) == 0 ) + else if (strncmp(param,"administrator",l) == 0) sWorld.SetPlayerLimit(-SEC_ADMINISTRATOR); - else if (strncmp(param,"reset",l) == 0 ) - sWorld.SetPlayerLimit( sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT) ); + else if (strncmp(param,"reset",l) == 0) + sWorld.SetPlayerLimit(sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT)); else { int val = atoi(param); @@ -6554,7 +6554,7 @@ bool ChatHandler::HandleCastCommand(const char *args) if (trig_str) { int l = strlen(trig_str); - if (strncmp(trig_str,"triggered",l) != 0 ) + if (strncmp(trig_str,"triggered",l) != 0) return false; } @@ -6586,7 +6586,7 @@ bool ChatHandler::HandleCastBackCommand(const char *args) if (trig_str) { int l = strlen(trig_str); - if (strncmp(trig_str,"triggered",l) != 0 ) + if (strncmp(trig_str,"triggered",l) != 0) return false; } @@ -6631,7 +6631,7 @@ bool ChatHandler::HandleCastDistCommand(const char *args) if (trig_str) { int l = strlen(trig_str); - if (strncmp(trig_str,"triggered",l) != 0 ) + if (strncmp(trig_str,"triggered",l) != 0) return false; } @@ -6671,7 +6671,7 @@ bool ChatHandler::HandleCastTargetCommand(const char *args) if (trig_str) { int l = strlen(trig_str); - if (strncmp(trig_str,"triggered",l) != 0 ) + if (strncmp(trig_str,"triggered",l) != 0) return false; } @@ -6880,7 +6880,7 @@ bool ChatHandler::HandleGMListFullCommand(const char* /*args*/) { Field *fields = result->Fetch(); PSendSysMessage("|%15s|%6s|", fields[0].GetString(),fields[1].GetString()); - }while ( result->NextRow() ); + }while (result->NextRow()); PSendSysMessage("========================"); } @@ -7067,7 +7067,7 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) // from console show not existed sender MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); - uint32 itemTextId = !text.empty() ? objmgr.CreateItemText( text ) : 0; + uint32 itemTextId = !text.empty() ? objmgr.CreateItemText(text) : 0; // fill mail MailDraft draft(subject, itemTextId); @@ -7127,7 +7127,7 @@ bool ChatHandler::HandleSendMoneyCommand(const char *args) // from console show not existed sender MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); - uint32 itemTextId = !text.empty() ? objmgr.CreateItemText( text ) : 0; + uint32 itemTextId = !text.empty() ? objmgr.CreateItemText(text) : 0; MailDraft(subject, itemTextId) .AddMoney(money) |