diff options
| author | Spp <none@none> | 2010-04-07 19:14:10 +0200 |
|---|---|---|
| committer | Spp <none@none> | 2010-04-07 19:14:10 +0200 |
| commit | d19e12708001fbef2308be0e8cb5375a2ac7af48 (patch) | |
| tree | 09fc8f67a6197802e0512950f0b0a3438a9834e8 /src/game/Level3.cpp | |
| parent | 2e127f7a30706dc1d40c65de22ff02851732da24 (diff) | |
Code style (game + scripts only):
"if(" --> "if ("
--HG--
branch : trunk
Diffstat (limited to 'src/game/Level3.cpp')
| -rw-r--r-- | src/game/Level3.cpp | 916 |
1 files changed, 458 insertions, 458 deletions
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 36471278b34..c237bccf4e5 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -617,7 +617,7 @@ bool ChatHandler::HandleReloadAllQuestCommand(const char* /*args*/) bool ChatHandler::HandleReloadAllScriptsCommand(const char*) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { PSendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); @@ -1135,19 +1135,19 @@ bool ChatHandler::HandleReloadItemRequiredTragetCommand(const char*) bool ChatHandler::HandleReloadGameObjectScriptsCommand(const char* arg) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*arg!='a') sLog.outString( "Re-Loading Scripts from `gameobject_scripts`..."); objmgr.LoadGameObjectScripts(); - if(*arg!='a') + if (*arg!='a') SendGlobalGMSysMessage("DB table `gameobject_scripts` reloaded."); return true; @@ -1155,19 +1155,19 @@ bool ChatHandler::HandleReloadGameObjectScriptsCommand(const char* arg) bool ChatHandler::HandleReloadEventScriptsCommand(const char* arg) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*arg!='a') sLog.outString( "Re-Loading Scripts from `event_scripts`..."); objmgr.LoadEventScripts(); - if(*arg!='a') + if (*arg!='a') SendGlobalGMSysMessage("DB table `event_scripts` reloaded."); return true; @@ -1175,19 +1175,19 @@ bool ChatHandler::HandleReloadEventScriptsCommand(const char* arg) bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*arg!='a') sLog.outString( "Re-Loading Scripts from `waypoint_scripts`..."); objmgr.LoadWaypointScripts(); - if(*arg!='a') + if (*arg!='a') SendGlobalGMSysMessage("DB table `waypoint_scripts` reloaded."); return true; @@ -1220,19 +1220,19 @@ bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* arg) bool ChatHandler::HandleReloadQuestEndScriptsCommand(const char* arg) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*arg!='a') sLog.outString( "Re-Loading Scripts from `quest_end_scripts`..."); objmgr.LoadQuestEndScripts(); - if(*arg!='a') + if (*arg!='a') SendGlobalGMSysMessage("DB table `quest_end_scripts` reloaded."); return true; @@ -1240,19 +1240,19 @@ bool ChatHandler::HandleReloadQuestEndScriptsCommand(const char* arg) bool ChatHandler::HandleReloadQuestStartScriptsCommand(const char* arg) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*arg!='a') sLog.outString( "Re-Loading Scripts from `quest_start_scripts`..."); objmgr.LoadQuestStartScripts(); - if(*arg!='a') + if (*arg!='a') SendGlobalGMSysMessage("DB table `quest_start_scripts` reloaded."); return true; @@ -1260,19 +1260,19 @@ bool ChatHandler::HandleReloadQuestStartScriptsCommand(const char* arg) bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg) { - if(sWorld.IsScriptScheduled()) + if (sWorld.IsScriptScheduled()) { SendSysMessage("DB scripts used currently, please attempt reload later."); SetSentErrorMessage(true); return false; } - if(*arg!='a') + if (*arg!='a') sLog.outString( "Re-Loading Scripts from `spell_scripts`..."); objmgr.LoadSpellScripts(); - if(*arg!='a') + if (*arg!='a') SendGlobalGMSysMessage("DB table `spell_scripts` reloaded."); return true; @@ -1403,7 +1403,7 @@ bool ChatHandler::HandleReloadAuctionsCommand(const char *args) bool ChatHandler::HandleAccountSetGmLevelCommand(const char *args) { - if(!*args) + if (!*args) return false; std::string targetAccountName; @@ -1497,7 +1497,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char *args) /// Set password for account bool ChatHandler::HandleAccountSetPasswordCommand(const char *args) { - if(!*args) + if (!*args) return false; ///- Get the command line arguments @@ -1563,7 +1563,7 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char *args) bool ChatHandler::HandleMaxSkillCommand(const char* /*args*/) { Player* SelectedPlayer = getSelectedPlayer(); - if(!SelectedPlayer) + if (!SelectedPlayer) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -2319,7 +2319,7 @@ bool ChatHandler::HandleLearnAllCommand(const char* /*args*/) continue; 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); continue; @@ -2359,7 +2359,7 @@ bool ChatHandler::HandleLearnAllGMCommand(const char* /*args*/) uint32 spell = atol((char*)gmSpellList[gmSpellIter++]); 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); continue; @@ -2382,35 +2382,35 @@ bool ChatHandler::HandleLearnAllMyClassCommand(const char* /*args*/) bool ChatHandler::HandleLearnAllMySpellsCommand(const char* /*args*/) { ChrClassesEntry const* clsEntry = sChrClassesStore.LookupEntry(m_session->GetPlayer()->getClass()); - if(!clsEntry) + if (!clsEntry) return true; uint32 family = clsEntry->spellfamily; for (uint32 i = 0; i < sSpellStore.GetNumRows(); ++i) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(i); - if(!spellInfo) + if (!spellInfo) continue; // skip server-side/triggered spells - if(spellInfo->spellLevel==0) + if (spellInfo->spellLevel==0) continue; // skip wrong class/race skills - if(!m_session->GetPlayer()->IsSpellFitByClassAndRace(spellInfo->Id)) + if (!m_session->GetPlayer()->IsSpellFitByClassAndRace(spellInfo->Id)) 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 - if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false)) + if (!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false)) continue; m_session->GetPlayer()->learnSpell(i,false); @@ -2428,32 +2428,32 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/) for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i) { TalentEntry const *talentInfo = sTalentStore.LookupEntry(i); - if(!talentInfo) + if (!talentInfo) continue; TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab ); - if(!talentTabInfo) + if (!talentTabInfo) continue; - if( (classMask & talentTabInfo->ClassMask) == 0 ) + if ( (classMask & talentTabInfo->ClassMask) == 0 ) continue; // search highest talent rank uint32 spellId = 0; for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { - if(talentInfo->RankID[rank] != 0) + if (talentInfo->RankID[rank] != 0) { spellId = talentInfo->RankID[rank]; break; } } - if(!spellId) // ??? none spells in talent + if (!spellId) // ??? none spells in talent continue; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId); - if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false)) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false)) continue; // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree) @@ -2472,7 +2472,7 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) Player* player = m_session->GetPlayer(); Pet* pet = player->GetPet(); - if(!pet) + if (!pet) { SendSysMessage(LANG_NO_PET_FOUND); SetSentErrorMessage(true); @@ -2480,7 +2480,7 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) } CreatureInfo const *ci = pet->GetCreatureInfo(); - if(!ci) + if (!ci) { SendSysMessage(LANG_WRONG_PET_TYPE); SetSentErrorMessage(true); @@ -2488,14 +2488,14 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) } CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(ci->family); - if(!pet_family) + if (!pet_family) { SendSysMessage(LANG_WRONG_PET_TYPE); SetSentErrorMessage(true); return false; } - if(pet_family->petTalentType < 0) // not hunter pet + if (pet_family->petTalentType < 0) // not hunter pet { SendSysMessage(LANG_WRONG_PET_TYPE); SetSentErrorMessage(true); @@ -2505,15 +2505,15 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i) { TalentEntry const *talentInfo = sTalentStore.LookupEntry(i); - if(!talentInfo) + if (!talentInfo) continue; TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab ); - if(!talentTabInfo) + if (!talentTabInfo) continue; // prevent learn talent for different family (cheating) - if(((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask)==0) + if (((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask)==0) continue; // search highest talent rank @@ -2521,18 +2521,18 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { - if(talentInfo->RankID[rank]!=0) + if (talentInfo->RankID[rank]!=0) { spellid = talentInfo->RankID[rank]; break; } } - if(!spellid) // ??? none spells in talent + if (!spellid) // ??? none spells in talent continue; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid); - if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false)) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false)) continue; // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree) @@ -2558,7 +2558,7 @@ bool ChatHandler::HandleLearnAllLangCommand(const char* /*args*/) bool ChatHandler::HandleLearnAllDefaultCommand(const char *args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args,&target)) return false; target->learnDefaultSpells(); @@ -2572,7 +2572,7 @@ bool ChatHandler::HandleLearnCommand(const char *args) { Player* targetPlayer = getSelectedPlayer(); - if(!targetPlayer) + if (!targetPlayer) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -2581,14 +2581,14 @@ 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)) + 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); @@ -2597,7 +2597,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()); @@ -2605,13 +2605,13 @@ bool ChatHandler::HandleLearnCommand(const char *args) return false; } - if(allRanks) + if (allRanks) targetPlayer->learnSpellHighRank(spell); else targetPlayer->learnSpell(spell,false); uint32 first_spell = spellmgr.GetFirstSpellInChain(spell); - if(GetTalentSpellCost(first_spell)) + if (GetTalentSpellCost(first_spell)) targetPlayer->SendTalentsInfoData(false); return true; @@ -2624,11 +2624,11 @@ bool ChatHandler::HandleAddItemCommand(const char *args) uint32 itemId = 0; - if(args[0]=='[') // [name] manual form + if (args[0]=='[') // [name] manual form { char* citemName = strtok((char*)args, "]"); - if(citemName && citemName[0]) + if (citemName && citemName[0]) { std::string itemName = citemName+1; WorldDatabase.escape_string(itemName); @@ -2647,7 +2647,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"); - if(!cId) + if (!cId) return false; itemId = atol(cId); } @@ -2664,13 +2664,13 @@ bool ChatHandler::HandleAddItemCommand(const char *args) Player* pl = m_session->GetPlayer(); Player* plTarget = getSelectedPlayer(); - if(!plTarget) + if (!plTarget) plTarget = pl; sLog.outDetail(GetTrinityString(LANG_ADDITEM), itemId, count); ItemPrototype const *pProto = objmgr.GetItemPrototype(itemId); - if(!pProto) + if (!pProto) { PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, itemId); SetSentErrorMessage(true); @@ -2691,10 +2691,10 @@ 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 + 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 ); SetSentErrorMessage(true); @@ -2704,19 +2704,19 @@ bool ChatHandler::HandleAddItemCommand(const char *args) Item* item = plTarget->StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId)); // remove binding (let GM give it to another player later) - if(pl==plTarget) + if (pl==plTarget) for (ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr) - if(Item* item1 = pl->GetItemByPos(itr->pos)) + if (Item* item1 = pl->GetItemByPos(itr->pos)) item1->SetBinding( false ); - if(count > 0 && item) + if (count > 0 && item) { pl->SendNewItem(item,count,false,true); - if(pl!=plTarget) + if (pl!=plTarget) plTarget->SendNewItem(item,count,true,false); } - if(noSpaceForCount > 0) + if (noSpaceForCount > 0) PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount); return true; @@ -2743,7 +2743,7 @@ bool ChatHandler::HandleAddItemSetCommand(const char *args) Player* pl = m_session->GetPlayer(); Player* plTarget = getSelectedPlayer(); - if(!plTarget) + if (!plTarget) plTarget = pl; sLog.outDetail(GetTrinityString(LANG_ADDITEMSET), itemsetId); @@ -2793,15 +2793,15 @@ bool ChatHandler::HandleAddItemSetCommand(const char *args) bool ChatHandler::HandleListItemCommand(const char *args) { - if(!*args) + if (!*args) return false; char* cId = extractKeyFromLink((char*)args,"Hitem"); - if(!cId) + if (!cId) return false; uint32 item_id = atol(cId); - if(!item_id) + if (!item_id) { PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id); SetSentErrorMessage(true); @@ -2809,7 +2809,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) } ItemPrototype const* itemProto = objmgr.GetItemPrototype(item_id); - if(!itemProto) + if (!itemProto) { PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id); SetSentErrorMessage(true); @@ -2819,7 +2819,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) char* c_count = strtok(NULL, " "); int count = c_count ? atol(c_count) : 10; - if(count < 0) + if (count < 0) return false; QueryResult_AutoPtr result; @@ -2827,7 +2827,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) // inventory case uint32 inv_count = 0; result=CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM character_inventory WHERE item_template='%u'",item_id); - if(result) + if (result) inv_count = (*result)[0].GetUInt32(); result=CharacterDatabase.PQuery( @@ -2837,7 +2837,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) "WHERE ci.item_template='%u' AND ci.guid = characters.guid LIMIT %u ", item_id,uint32(count)); - if(result) + if (result) { do { @@ -2850,11 +2850,11 @@ bool ChatHandler::HandleListItemCommand(const char *args) std::string owner_name = fields[5].GetCppString(); char const* item_pos = 0; - if(Player::IsEquipmentPos(item_bag,item_slot)) + if (Player::IsEquipmentPos(item_bag,item_slot)) item_pos = "[equipped]"; - else if(Player::IsInventoryPos(item_bag,item_slot)) + else if (Player::IsInventoryPos(item_bag,item_slot)) item_pos = "[in inventory]"; - else if(Player::IsBankPos(item_bag,item_slot)) + else if (Player::IsBankPos(item_bag,item_slot)) item_pos = "[in bank]"; else item_pos = ""; @@ -2865,19 +2865,19 @@ bool ChatHandler::HandleListItemCommand(const char *args) int64 res_count = result->GetRowCount(); - if(count > res_count) + if (count > res_count) count-=res_count; - else if(count) + else if (count) count = 0; } // mail case uint32 mail_count = 0; result=CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM mail_items WHERE item_template='%u'", item_id); - if(result) + if (result) mail_count = (*result)[0].GetUInt32(); - if(count > 0) + if (count > 0) { result=CharacterDatabase.PQuery( // 0 1 2 3 4 5 6 @@ -2889,7 +2889,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) else result = QueryResult_AutoPtr(NULL); - if(result) + if (result) { do { @@ -2910,19 +2910,19 @@ bool ChatHandler::HandleListItemCommand(const char *args) int64 res_count = result->GetRowCount(); - if(count > res_count) + if (count > res_count) count-=res_count; - else if(count) + else if (count) count = 0; } // auction case uint32 auc_count = 0; result=CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM auctionhouse WHERE item_template='%u'",item_id); - if(result) + if (result) auc_count = (*result)[0].GetUInt32(); - if(count > 0) + if (count > 0) { result=CharacterDatabase.PQuery( // 0 1 2 3 @@ -2933,7 +2933,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) else result = QueryResult_AutoPtr(NULL); - if(result) + if (result) { do { @@ -2952,7 +2952,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) // guild bank case uint32 guild_count = 0; result=CharacterDatabase.PQuery("SELECT COUNT(item_entry) FROM guild_bank_item WHERE item_entry='%u'",item_id); - if(result) + if (result) guild_count = (*result)[0].GetUInt32(); result=CharacterDatabase.PQuery( @@ -2961,7 +2961,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) "FROM guild_bank_item AS gi, guild WHERE gi.item_entry='%u' AND gi.guildid = guild.guildid LIMIT %u ", item_id,uint32(count)); - if(result) + if (result) { do { @@ -2977,13 +2977,13 @@ bool ChatHandler::HandleListItemCommand(const char *args) int64 res_count = result->GetRowCount(); - if(count > res_count) + if (count > res_count) count-=res_count; - else if(count) + else if (count) count = 0; } - if(inv_count+mail_count+auc_count+guild_count == 0) + if (inv_count+mail_count+auc_count+guild_count == 0) { SendSysMessage(LANG_COMMAND_NOITEMFOUND); SetSentErrorMessage(true); @@ -2997,16 +2997,16 @@ bool ChatHandler::HandleListItemCommand(const char *args) bool ChatHandler::HandleListObjectCommand(const char *args) { - if(!*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"); - if(!cId) + if (!cId) return false; uint32 go_id = atol(cId); - if(!go_id) + if (!go_id) { PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, go_id); SetSentErrorMessage(true); @@ -3014,7 +3014,7 @@ bool ChatHandler::HandleListObjectCommand(const char *args) } GameObjectInfo const * gInfo = objmgr.GetGameObjectInfo(go_id); - if(!gInfo) + if (!gInfo) { PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, go_id); SetSentErrorMessage(true); @@ -3024,17 +3024,17 @@ bool ChatHandler::HandleListObjectCommand(const char *args) char* c_count = strtok(NULL, " "); int count = c_count ? atol(c_count) : 10; - if(count < 0) + if (count < 0) return false; QueryResult_AutoPtr result; uint32 obj_count = 0; result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM gameobject WHERE id='%u'",go_id); - if(result) + if (result) obj_count = (*result)[0].GetUInt32(); - if(m_session) + if (m_session) { Player* pl = m_session->GetPlayer(); result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE id = '%u' ORDER BY order_ ASC LIMIT %u", @@ -3070,19 +3070,19 @@ bool ChatHandler::HandleGameObjectStateCommand(const char *args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r char* cId = extractKeyFromLink((char*)args, "Hgameobject"); - if(!cId) + if (!cId) return false; uint32 lowguid = atoi(cId); - if(!lowguid) + if (!lowguid) return false; GameObject* gobj = NULL; - if(GameObjectData const* goData = objmgr.GetGOData(lowguid)) + if (GameObjectData const* goData = objmgr.GetGOData(lowguid)) gobj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, goData->id); - if(!gobj) + if (!gobj) { PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -3090,15 +3090,15 @@ bool ChatHandler::HandleGameObjectStateCommand(const char *args) } char* ctype = strtok(NULL, " "); - if(!ctype) + if (!ctype) return false; int32 type = atoi(ctype); - if(type < 0) + if (type < 0) { - if(type == -1) + if (type == -1) gobj->SendObjectDeSpawnAnim(gobj->GetGUID()); - else if(type == -2) + else if (type == -2) { return false; } @@ -3106,14 +3106,14 @@ bool ChatHandler::HandleGameObjectStateCommand(const char *args) } char* cstate = strtok(NULL, " "); - if(!cstate) + if (!cstate) return false; int32 state = atoi(cstate); - if(type < 4) + if (type < 4) gobj->SetByteValue(GAMEOBJECT_BYTES_1, type, state); - else if(type == 4) + else if (type == 4) { WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM,8+4); data << gobj->GetGUID(); @@ -3127,16 +3127,16 @@ bool ChatHandler::HandleGameObjectStateCommand(const char *args) bool ChatHandler::HandleListCreatureCommand(const char *args) { - if(!*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"); - if(!cId) + if (!cId) return false; uint32 cr_id = atol(cId); - if(!cr_id) + if (!cr_id) { PSendSysMessage(LANG_COMMAND_INVALIDCREATUREID, cr_id); SetSentErrorMessage(true); @@ -3144,7 +3144,7 @@ bool ChatHandler::HandleListCreatureCommand(const char *args) } CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(cr_id); - if(!cInfo) + if (!cInfo) { PSendSysMessage(LANG_COMMAND_INVALIDCREATUREID, cr_id); SetSentErrorMessage(true); @@ -3154,17 +3154,17 @@ bool ChatHandler::HandleListCreatureCommand(const char *args) char* c_count = strtok(NULL, " "); int count = c_count ? atol(c_count) : 10; - if(count < 0) + if (count < 0) return false; QueryResult_AutoPtr result; uint32 cr_count = 0; result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id='%u'",cr_id); - if(result) + if (result) cr_count = (*result)[0].GetUInt32(); - if(m_session) + if (m_session) { Player* pl = m_session->GetPlayer(); result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM creature WHERE id = '%u' ORDER BY order_ ASC LIMIT %u", @@ -3198,14 +3198,14 @@ bool ChatHandler::HandleListCreatureCommand(const char *args) bool ChatHandler::HandleLookupItemCommand(const char *args) { - if(!*args) + if (!*args) return false; std::string namepart = args; std::wstring wnamepart; // converting string that we try to find to lower case - if(!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart,wnamepart)) return false; wstrToLower(wnamepart); @@ -3216,7 +3216,7 @@ bool ChatHandler::HandleLookupItemCommand(const char *args) for (uint32 id = 0; id < sItemStorage.MaxEntry; id++) { ItemPrototype const *pProto = sItemStorage.LookupEntry<ItemPrototype >(id); - if(!pProto) + if (!pProto) continue; int loc_idx = GetSessionDbLocaleIndex(); @@ -3236,7 +3236,7 @@ bool ChatHandler::HandleLookupItemCommand(const char *args) else PSendSysMessage(LANG_ITEM_LIST_CONSOLE, id, name.c_str()); - if(!found) + if (!found) found = true; continue; @@ -3246,7 +3246,7 @@ bool ChatHandler::HandleLookupItemCommand(const char *args) } std::string name = pProto->Name1; - if(name.empty()) + if (name.empty()) continue; if (Utf8FitTo(name, wnamepart)) @@ -3256,7 +3256,7 @@ bool ChatHandler::HandleLookupItemCommand(const char *args) else PSendSysMessage(LANG_ITEM_LIST_CONSOLE, id, name.c_str()); - if(!found) + if (!found) found = true; } } @@ -3269,13 +3269,13 @@ bool ChatHandler::HandleLookupItemCommand(const char *args) bool ChatHandler::HandleLookupItemSetCommand(const char *args) { - if(!*args) + if (!*args) return false; 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 @@ -3287,11 +3287,11 @@ bool ChatHandler::HandleLookupItemSetCommand(const char *args) for (uint32 id = 0; id < sItemSetStore.GetNumRows(); id++) { ItemSetEntry const *set = sItemSetStore.LookupEntry(id); - if(set) + if (set) { int loc = GetSessionDbcLocale(); std::string name = set->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (!Utf8FitTo(name, wnamepart)) @@ -3299,11 +3299,11 @@ bool ChatHandler::HandleLookupItemSetCommand(const char *args) loc = 0; for (; loc < MAX_LOCALE; ++loc) { - if(loc==GetSessionDbcLocale()) + if (loc==GetSessionDbcLocale()) continue; name = set->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (Utf8FitTo(name, wnamepart)) @@ -3311,7 +3311,7 @@ bool ChatHandler::HandleLookupItemSetCommand(const char *args) } } - if(loc < MAX_LOCALE) + if (loc < MAX_LOCALE) { // send item set in "id - [namedlink locale]" format if (m_session) @@ -3319,7 +3319,7 @@ bool ChatHandler::HandleLookupItemSetCommand(const char *args) else PSendSysMessage(LANG_ITEMSET_LIST_CONSOLE,id,name.c_str(),localeNames[loc]); - if(!found) + if (!found) found = true; } } @@ -3331,7 +3331,7 @@ bool ChatHandler::HandleLookupItemSetCommand(const char *args) bool ChatHandler::HandleLookupSkillCommand(const char *args) { - if(!*args) + if (!*args) return false; // can be NULL in console call @@ -3340,7 +3340,7 @@ bool ChatHandler::HandleLookupSkillCommand(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 @@ -3352,11 +3352,11 @@ bool ChatHandler::HandleLookupSkillCommand(const char *args) for (uint32 id = 0; id < sSkillLineStore.GetNumRows(); id++) { SkillLineEntry const *skillInfo = sSkillLineStore.LookupEntry(id); - if(skillInfo) + if (skillInfo) { int loc = GetSessionDbcLocale(); std::string name = skillInfo->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (!Utf8FitTo(name, wnamepart)) @@ -3364,11 +3364,11 @@ bool ChatHandler::HandleLookupSkillCommand(const char *args) loc = 0; for (; loc < MAX_LOCALE; ++loc) { - if(loc==GetSessionDbcLocale()) + if (loc==GetSessionDbcLocale()) continue; name = skillInfo->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (Utf8FitTo(name, wnamepart)) @@ -3376,11 +3376,11 @@ bool ChatHandler::HandleLookupSkillCommand(const char *args) } } - if(loc < MAX_LOCALE) + if (loc < MAX_LOCALE) { char valStr[50] = ""; char const* knownStr = ""; - if(target && target->HasSkill(id)) + if (target && target->HasSkill(id)) { knownStr = GetTrinityString(LANG_KNOWN); uint32 curValue = target->GetPureSkillValue(id); @@ -3398,7 +3398,7 @@ bool ChatHandler::HandleLookupSkillCommand(const char *args) else PSendSysMessage(LANG_SKILL_LIST_CONSOLE,id,name.c_str(),localeNames[loc],knownStr,valStr); - if(!found) + if (!found) found = true; } } @@ -3410,7 +3410,7 @@ bool ChatHandler::HandleLookupSkillCommand(const char *args) bool ChatHandler::HandleLookupSpellCommand(const char *args) { - if(!*args) + if (!*args) return false; // can be NULL at console call @@ -3419,7 +3419,7 @@ bool ChatHandler::HandleLookupSpellCommand(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 @@ -3431,11 +3431,11 @@ bool ChatHandler::HandleLookupSpellCommand(const char *args) for (uint32 id = 0; id < sSpellStore.GetNumRows(); id++) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(id); - if(spellInfo) + if (spellInfo) { int loc = GetSessionDbcLocale(); std::string name = spellInfo->SpellName[loc]; - if(name.empty()) + if (name.empty()) continue; if (!Utf8FitTo(name, wnamepart)) @@ -3443,11 +3443,11 @@ bool ChatHandler::HandleLookupSpellCommand(const char *args) loc = 0; for (; loc < MAX_LOCALE; ++loc) { - if(loc==GetSessionDbcLocale()) + if (loc==GetSessionDbcLocale()) continue; name = spellInfo->SpellName[loc]; - if(name.empty()) + if (name.empty()) continue; if (Utf8FitTo(name, wnamepart)) @@ -3455,7 +3455,7 @@ bool ChatHandler::HandleLookupSpellCommand(const char *args) } } - if(loc < MAX_LOCALE) + if (loc < MAX_LOCALE) { bool known = target && target->HasSpell(id); bool learn = (spellInfo->Effect[0] == SPELL_EFFECT_LEARN_SPELL); @@ -3478,7 +3478,7 @@ bool ChatHandler::HandleLookupSpellCommand(const char *args) ss << id << " - " << name; // include rank in link name - if(rank) + if (rank) ss << GetTrinityString(LANG_SPELL_RANK) << rank; if (m_session) @@ -3486,20 +3486,20 @@ bool ChatHandler::HandleLookupSpellCommand(const char *args) else ss << " " << localeNames[loc]; - if(talent) + if (talent) ss << GetTrinityString(LANG_TALENT); - if(passive) + if (passive) ss << GetTrinityString(LANG_PASSIVE); - if(learn) + if (learn) ss << GetTrinityString(LANG_LEARN); - if(known) + if (known) ss << GetTrinityString(LANG_KNOWN); - if(active) + if (active) ss << GetTrinityString(LANG_ACTIVE); SendSysMessage(ss.str().c_str()); - if(!found) + if (!found) found = true; } } @@ -3511,7 +3511,7 @@ bool ChatHandler::HandleLookupSpellCommand(const char *args) bool ChatHandler::HandleLookupQuestCommand(const char *args) { - if(!*args) + if (!*args) return false; // can be NULL at console call @@ -3521,7 +3521,7 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args) std::wstring wnamepart; // converting string that we try to find to lower case - if(!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart,wnamepart)) return false; wstrToLower(wnamepart); @@ -3547,18 +3547,18 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args) { char const* statusStr = ""; - if(target) + if (target) { QuestStatus status = target->GetQuestStatus(qinfo->GetQuestId()); - if(status == QUEST_STATUS_COMPLETE) + if (status == QUEST_STATUS_COMPLETE) { - if(target->GetQuestRewardStatus(qinfo->GetQuestId())) + if (target->GetQuestRewardStatus(qinfo->GetQuestId())) statusStr = GetTrinityString(LANG_COMMAND_QUEST_REWARDED); else statusStr = GetTrinityString(LANG_COMMAND_QUEST_COMPLETE); } - else if(status == QUEST_STATUS_INCOMPLETE) + else if (status == QUEST_STATUS_INCOMPLETE) statusStr = GetTrinityString(LANG_COMMAND_QUEST_ACTIVE); } @@ -3567,7 +3567,7 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args) else PSendSysMessage(LANG_QUEST_LIST_CONSOLE,qinfo->GetQuestId(),title.c_str(),statusStr); - if(!found) + if (!found) found = true; continue; @@ -3577,25 +3577,25 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args) } std::string title = qinfo->GetTitle(); - if(title.empty()) + if (title.empty()) continue; if (Utf8FitTo(title, wnamepart)) { char const* statusStr = ""; - if(target) + if (target) { QuestStatus status = target->GetQuestStatus(qinfo->GetQuestId()); - if(status == QUEST_STATUS_COMPLETE) + if (status == QUEST_STATUS_COMPLETE) { - if(target->GetQuestRewardStatus(qinfo->GetQuestId())) + if (target->GetQuestRewardStatus(qinfo->GetQuestId())) statusStr = GetTrinityString(LANG_COMMAND_QUEST_REWARDED); else statusStr = GetTrinityString(LANG_COMMAND_QUEST_COMPLETE); } - else if(status == QUEST_STATUS_INCOMPLETE) + else if (status == QUEST_STATUS_INCOMPLETE) statusStr = GetTrinityString(LANG_COMMAND_QUEST_ACTIVE); } @@ -3604,7 +3604,7 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args) else PSendSysMessage(LANG_QUEST_LIST_CONSOLE,qinfo->GetQuestId(),title.c_str(),statusStr); - if(!found) + if (!found) found = true; } } @@ -3634,7 +3634,7 @@ bool ChatHandler::HandleLookupCreatureCommand(const char *args) for (uint32 id = 0; id< sCreatureStorage.MaxEntry; ++id) { CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo> (id); - if(!cInfo) + if (!cInfo) continue; int loc_idx = GetSessionDbLocaleIndex(); @@ -3654,7 +3654,7 @@ bool ChatHandler::HandleLookupCreatureCommand(const char *args) else PSendSysMessage (LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name.c_str ()); - if(!found) + if (!found) found = true; continue; @@ -3674,7 +3674,7 @@ bool ChatHandler::HandleLookupCreatureCommand(const char *args) else PSendSysMessage (LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name.c_str ()); - if(!found) + if (!found) found = true; } } @@ -3687,14 +3687,14 @@ bool ChatHandler::HandleLookupCreatureCommand(const char *args) bool ChatHandler::HandleLookupObjectCommand(const char *args) { - if(!*args) + if (!*args) return false; std::string namepart = args; std::wstring wnamepart; // converting string that we try to find to lower case - if(!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart,wnamepart)) return false; wstrToLower(wnamepart); @@ -3704,7 +3704,7 @@ bool ChatHandler::HandleLookupObjectCommand(const char *args) for (uint32 id = 0; id< sGOStorage.MaxEntry; id++ ) { GameObjectInfo const* gInfo = sGOStorage.LookupEntry<GameObjectInfo>(id); - if(!gInfo) + if (!gInfo) continue; int loc_idx = GetSessionDbLocaleIndex(); @@ -3724,7 +3724,7 @@ bool ChatHandler::HandleLookupObjectCommand(const char *args) else PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, id, name.c_str()); - if(!found) + if (!found) found = true; continue; @@ -3734,22 +3734,22 @@ bool ChatHandler::HandleLookupObjectCommand(const char *args) } std::string name = gInfo->name; - if(name.empty()) + if (name.empty()) continue; - if(Utf8FitTo(name, wnamepart)) + if (Utf8FitTo(name, wnamepart)) { if (m_session) PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, id, id, name.c_str()); else PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, id, name.c_str()); - if(!found) + if (!found) found = true; } } - if(!found) + if (!found) SendSysMessage(LANG_COMMAND_NOGAMEOBJECTFOUND); return true; @@ -3783,7 +3783,7 @@ bool ChatHandler::HandleLookupFactionCommand(const char *args) int loc = GetSessionDbcLocale(); std::string name = factionEntry->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (!Utf8FitTo(name, wnamepart)) @@ -3791,11 +3791,11 @@ bool ChatHandler::HandleLookupFactionCommand(const char *args) loc = 0; for (; loc < MAX_LOCALE; ++loc) { - if(loc==GetSessionDbcLocale()) + if (loc==GetSessionDbcLocale()) continue; name = factionEntry->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (Utf8FitTo(name, wnamepart)) @@ -3803,7 +3803,7 @@ bool ChatHandler::HandleLookupFactionCommand(const char *args) } } - if(loc < MAX_LOCALE) + if (loc < MAX_LOCALE) { // send faction in "id - [faction] rank reputation [visible] [at war] [own team] [unknown] [invisible] [inactive]" format // or "id - [faction] [no reputation]" format @@ -3820,17 +3820,17 @@ bool ChatHandler::HandleLookupFactionCommand(const char *args) ss << " " << rankName << "|h|r (" << target->GetReputationMgr().GetReputation(factionEntry) << ")"; - if(repState->Flags & FACTION_FLAG_VISIBLE) + if (repState->Flags & FACTION_FLAG_VISIBLE) ss << GetTrinityString(LANG_FACTION_VISIBLE); - if(repState->Flags & FACTION_FLAG_AT_WAR) + if (repState->Flags & FACTION_FLAG_AT_WAR) ss << GetTrinityString(LANG_FACTION_ATWAR); - if(repState->Flags & FACTION_FLAG_PEACE_FORCED) + if (repState->Flags & FACTION_FLAG_PEACE_FORCED) ss << GetTrinityString(LANG_FACTION_PEACE_FORCED); - if(repState->Flags & FACTION_FLAG_HIDDEN) + if (repState->Flags & FACTION_FLAG_HIDDEN) ss << GetTrinityString(LANG_FACTION_HIDDEN); - if(repState->Flags & FACTION_FLAG_INVISIBLE_FORCED) + if (repState->Flags & FACTION_FLAG_INVISIBLE_FORCED) ss << GetTrinityString(LANG_FACTION_INVISIBLE_FORCED); - if(repState->Flags & FACTION_FLAG_INACTIVE) + if (repState->Flags & FACTION_FLAG_INACTIVE) ss << GetTrinityString(LANG_FACTION_INACTIVE); } else @@ -3838,7 +3838,7 @@ bool ChatHandler::HandleLookupFactionCommand(const char *args) SendSysMessage(ss.str().c_str()); - if(!found) + if (!found) found = true; } } @@ -3851,13 +3851,13 @@ bool ChatHandler::HandleLookupFactionCommand(const char *args) bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) { - if(!*args) + if (!*args) return false; 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 @@ -3869,11 +3869,11 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) for (uint32 id = 0; id < sTaxiNodesStore.GetNumRows(); id++) { TaxiNodesEntry const *nodeEntry = sTaxiNodesStore.LookupEntry(id); - if(nodeEntry) + if (nodeEntry) { int loc = GetSessionDbcLocale(); std::string name = nodeEntry->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (!Utf8FitTo(name, wnamepart)) @@ -3881,11 +3881,11 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) loc = 0; for (; loc < MAX_LOCALE; ++loc) { - if(loc==GetSessionDbcLocale()) + if (loc==GetSessionDbcLocale()) continue; name = nodeEntry->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (Utf8FitTo(name, wnamepart)) @@ -3893,7 +3893,7 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) } } - if(loc < MAX_LOCALE) + if (loc < MAX_LOCALE) { // send taxinode in "id - [name] (Map:m X:x Y:y Z:z)" format if (m_session) @@ -3903,7 +3903,7 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) PSendSysMessage (LANG_TAXINODE_ENTRY_LIST_CONSOLE, id, name.c_str(), localeNames[loc], nodeEntry->map_id,nodeEntry->x,nodeEntry->y,nodeEntry->z); - if(!found) + if (!found) found = true; } } @@ -3915,14 +3915,14 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) bool ChatHandler::HandleLookupMapCommand(const char *args) { - if(!*args) + if (!*args) return false; /*std::string namepart = args; std::wstring wnamepart; // converting string that we try to find to lower case - if(!Utf8toWStr(namepart, wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; wstrToLower(wnamepart); @@ -3933,42 +3933,42 @@ bool ChatHandler::HandleLookupMapCommand(const char *args) for (uint32 id = 0; id < sMapStore.GetNumRows(); id++) { MapEntry const* MapInfo = sMapStore.LookupEntry(id); - if(MapInfo) + if (MapInfo) { uint8 loc = m_session ? m_session->GetSessionDbcLocale() : sWorld.GetDefaultDbcLocale(); std::string name = MapInfo->name[loc]; - if(name.empty()) + if (name.empty()) continue; - if(!Utf8FitTo(name, wnamepart)) + if (!Utf8FitTo(name, wnamepart)) { loc = LOCALE_enUS; for (; loc < MAX_LOCALE; loc++) { - if(m_session && loc == m_session->GetSessionDbcLocale()) + if (m_session && loc == m_session->GetSessionDbcLocale()) continue; name = MapInfo->name[loc]; - if(name.empty()) + if (name.empty()) continue; - if(Utf8FitTo(name, wnamepart)) + if (Utf8FitTo(name, wnamepart)) break; } } - if(loc < MAX_LOCALE) + if (loc < MAX_LOCALE) { // send map in "id - [name][Continent][Instance/Battleground/Arena][Raid reset time:][Heroic reset time:][Mountable]" format std::ostringstream ss; - if(m_session) + if (m_session) ss << id << " - |cffffffff|Hmap:" << id << "|h[" << name << "]"; else // console ss << id << " - [" << name << "]"; - if(MapInfo->IsContinent()) + if (MapInfo->IsContinent()) ss << GetTrinityString(LANG_CONTINENT); switch(MapInfo->map_type) @@ -3978,42 +3978,42 @@ bool ChatHandler::HandleLookupMapCommand(const char *args) case MAP_ARENA: ss << GetTrinityString(LANG_ARENA); break; } - if(MapInfo->IsRaid()) + if (MapInfo->IsRaid()) ss << GetTrinityString(LANG_RAID); - if(MapInfo->SupportsHeroicMode()) + if (MapInfo->SupportsHeroicMode()) ss << GetTrinityString(LANG_HEROIC); uint32 ResetTimeRaid = MapInfo->resetTimeRaid; std::string ResetTimeRaidStr; - if(ResetTimeRaid) + if (ResetTimeRaid) ResetTimeRaidStr = secsToTimeString(ResetTimeRaid, true, false); uint32 ResetTimeHeroic = MapInfo->resetTimeHeroic; std::string ResetTimeHeroicStr; - if(ResetTimeHeroic) + if (ResetTimeHeroic) ResetTimeHeroicStr = secsToTimeString(ResetTimeHeroic, true, false); - if(MapInfo->IsMountAllowed()) + if (MapInfo->IsMountAllowed()) ss << GetTrinityString(LANG_MOUNTABLE); - if(ResetTimeRaid && !ResetTimeHeroic) + if (ResetTimeRaid && !ResetTimeHeroic) PSendSysMessage(ss.str().c_str(), ResetTimeRaidStr.c_str()); - else if(!ResetTimeRaid && ResetTimeHeroic) + else if (!ResetTimeRaid && ResetTimeHeroic) PSendSysMessage(ss.str().c_str(), ResetTimeHeroicStr.c_str()); - else if(ResetTimeRaid && ResetTimeHeroic) + else if (ResetTimeRaid && ResetTimeHeroic) PSendSysMessage(ss.str().c_str(), ResetTimeRaidStr.c_str(), ResetTimeHeroicStr.c_str()); else SendSysMessage(ss.str().c_str()); - if(!found) + if (!found) found = true; } } } - if(!found) + if (!found) SendSysMessage(LANG_COMMAND_NOMAPFOUND); */ return true; @@ -4029,20 +4029,20 @@ bool ChatHandler::HandleLookupMapCommand(const char *args) */ bool ChatHandler::HandleGuildCreateCommand(const char *args) { - if(!*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!='"' ? (char*)args : NULL, &target)) return false; char* tailStr = *args!='"' ? strtok(NULL, "") : (char*)args; - if(!tailStr) + if (!tailStr) return false; char* guildStr = extractQuotedArg(tailStr); - if(!guildStr) + if (!guildStr) return false; std::string guildname = guildStr; @@ -4068,20 +4068,20 @@ bool ChatHandler::HandleGuildCreateCommand(const char *args) bool ChatHandler::HandleGuildInviteCommand(const 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!='"' ? (char*)args : NULL, NULL, &target_guid)) return false; char* tailStr = *args!='"' ? strtok(NULL, "") : (char*)args; - if(!tailStr) + if (!tailStr) return false; char* guildStr = extractQuotedArg(tailStr); - if(!guildStr) + if (!guildStr) return false; std::string glName = guildStr; @@ -4100,7 +4100,7 @@ bool ChatHandler::HandleGuildUninviteCommand(const char *args) { Player* target; uint64 target_guid; - if(!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget((char*)args,&target,&target_guid)) return false; uint32 glId = target ? target->GetGuildId () : Player::GetGuildIdFromDB (target_guid); @@ -4120,13 +4120,13 @@ bool ChatHandler::HandleGuildRankCommand(const char *args) char* nameStr; char* rankStr; extractOptFirstArg((char*)args,&nameStr,&rankStr); - if(!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); @@ -4151,7 +4151,7 @@ bool ChatHandler::HandleGuildDeleteCommand(const char *args) return false; char* guildStr = extractQuotedArg((char*)args); - if(!guildStr) + if (!guildStr) return false; std::string gld = guildStr; @@ -4172,10 +4172,10 @@ bool ChatHandler::HandleGetDistanceCommand(const char *args) if (*args) { uint64 guid = extractGuidFromLink((char*)args); - if(guid) + if (guid) obj = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*m_session->GetPlayer(),guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); - if(!obj) + if (!obj) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -4186,7 +4186,7 @@ bool ChatHandler::HandleGetDistanceCommand(const char *args) { obj = getSelectedUnit(); - if(!obj) + if (!obj) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -4202,22 +4202,22 @@ bool ChatHandler::HandleDieCommand(const char* /*args*/) { Unit* target = getSelectedUnit(); - if(!target || !m_session->GetPlayer()->GetSelection()) + if (!target || !m_session->GetPlayer()->GetSelection()) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); return false; } - if(target->GetTypeId() == TYPEID_PLAYER) + if (target->GetTypeId() == TYPEID_PLAYER) { - if(HasLowerSecurity((Player*)target,0,false)) + if (HasLowerSecurity((Player*)target,0,false)) return false; } - if( target->isAlive() ) + if ( target->isAlive() ) { - if(sWorld.getConfig(CONFIG_DIE_COMMAND_MODE)) + if (sWorld.getConfig(CONFIG_DIE_COMMAND_MODE)) m_session->GetPlayer()->Kill(target); else m_session->GetPlayer()->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -4248,7 +4248,7 @@ bool ChatHandler::HandleDamageCommand(const char * args) return false; int32 damage_int = atoi((char*)damageStr); - if(damage_int <=0) + if (damage_int <=0) return true; uint32 damage = damage_int; @@ -4265,7 +4265,7 @@ bool ChatHandler::HandleDamageCommand(const char * args) } uint32 school = schoolStr ? atoi((char*)schoolStr) : SPELL_SCHOOL_NORMAL; - if(school >= MAX_SPELL_SCHOOL) + if (school >= MAX_SPELL_SCHOOL) return false; SpellSchoolMask schoolmask = SpellSchoolMask(1 << school); @@ -4311,7 +4311,7 @@ bool ChatHandler::HandleModifyArenaCommand(const char * args) return false; Player *target = getSelectedPlayer(); - if(!target) + if (!target) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -4331,7 +4331,7 @@ bool ChatHandler::HandleReviveCommand(const char *args) { Player* target; uint64 target_guid; - if(!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget((char*)args,&target,&target_guid)) return false; if (target) @@ -4350,7 +4350,7 @@ bool ChatHandler::HandleReviveCommand(const char *args) bool ChatHandler::HandleAuraCommand(const char *args) { Unit *target = getSelectedUnit(); - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -4369,7 +4369,7 @@ bool ChatHandler::HandleAuraCommand(const char *args) bool ChatHandler::HandleUnAuraCommand(const char *args) { Unit *target = getSelectedUnit(); - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -4385,7 +4385,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); - if(!spellID) + if (!spellID) return false; target->RemoveAurasDueToSpell(spellID); @@ -4395,7 +4395,7 @@ bool ChatHandler::HandleUnAuraCommand(const char *args) bool ChatHandler::HandleLinkGraveCommand(const char *args) { - if(!*args) + if (!*args) return false; char* px = strtok((char*)args, " "); @@ -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,14 +4431,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(objmgr.AddGraveYardLink(g_id,zoneId,g_team)) + if (objmgr.AddGraveYardLink(g_id,zoneId,g_team)) PSendSysMessage(LANG_COMMAND_GRAVEYARDLINKED, g_id,zoneId); else PSendSysMessage(LANG_COMMAND_GRAVEYARDALRLINKED, g_id,zoneId); @@ -4452,7 +4452,7 @@ bool ChatHandler::HandleNearGraveCommand(const char *args) size_t argslen = strlen(args); - if(!*args) + if (!*args) g_team = 0; else if (strncmp((char*)args,"horde",argslen)==0) g_team = HORDE; @@ -4467,7 +4467,7 @@ bool ChatHandler::HandleNearGraveCommand(const char *args) WorldSafeLocsEntry const* graveyard = objmgr.GetClosestGraveYard( player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(),player->GetMapId(),g_team); - if(graveyard) + if (graveyard) { uint32 g_id = graveyard->ID; @@ -4483,11 +4483,11 @@ bool ChatHandler::HandleNearGraveCommand(const char *args) std::string team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_NOTEAM); - if(g_team == 0) + if (g_team == 0) team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_ANY); - else if(g_team == HORDE) + else if (g_team == HORDE) team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_HORDE); - else if(g_team == ALLIANCE) + else if (g_team == ALLIANCE) team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_ALLIANCE); PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, g_id,team_name.c_str(),zone_id); @@ -4496,14 +4496,14 @@ bool ChatHandler::HandleNearGraveCommand(const char *args) { std::string team_name; - if(g_team == 0) + if (g_team == 0) team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_ANY); - else if(g_team == HORDE) + else if (g_team == HORDE) team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_HORDE); - else if(g_team == ALLIANCE) + else if (g_team == ALLIANCE) team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_ALLIANCE); - if(g_team == ~uint32(0)) + if (g_team == ~uint32(0)) PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id); else PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id,team_name.c_str()); @@ -4515,7 +4515,7 @@ bool ChatHandler::HandleNearGraveCommand(const char *args) //-----------------------Npc Commands----------------------- bool ChatHandler::HandleNpcAllowMovementCommand(const char* /*args*/) { - if(sWorld.getAllowMovement()) + if (sWorld.getAllowMovement()) { sWorld.SetAllowMovement(false); SendSysMessage(LANG_CREATURE_MOVE_DISABLED); @@ -4534,18 +4534,18 @@ bool ChatHandler::HandleNpcChangeEntryCommand(const char *args) return false; uint32 newEntryNum = atoi(args); - if(!newEntryNum) + if (!newEntryNum) return false; Unit* unit = getSelectedUnit(); - if(!unit || unit->GetTypeId() != TYPEID_UNIT) + if (!unit || unit->GetTypeId() != TYPEID_UNIT) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); return false; } Creature* creature = unit->ToCreature(); - if(creature->UpdateEntry(newEntryNum)) + if (creature->UpdateEntry(newEntryNum)) SendSysMessage(LANG_DONE); else SendSysMessage(LANG_ERROR); @@ -4556,7 +4556,7 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/) { Creature* target = getSelectedCreature(); - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -4571,7 +4571,7 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/) CreatureInfo const* cInfo = target->GetCreatureInfo(); int32 curRespawnDelay = target->GetRespawnTimeEx()-time(NULL); - if(curRespawnDelay < 0) + if (curRespawnDelay < 0) curRespawnDelay = 0; std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay,true); std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true); @@ -4586,8 +4586,8 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/) PSendSysMessage(LANG_NPCINFO_PHASEMASK, target->GetPhaseMask()); PSendSysMessage(LANG_NPCINFO_ARMOR, target->GetArmor()); PSendSysMessage(LANG_NPCINFO_POSITION,float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ())); - if(const CreatureData* const linked = target->GetLinkedRespawnCreatureData()) - if(CreatureInfo const *master = GetCreatureInfo(linked->id)) + if (const CreatureData* const linked = target->GetLinkedRespawnCreatureData()) + 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) ) @@ -4608,7 +4608,7 @@ bool ChatHandler::HandleNpcPlayEmoteCommand(const char *args) uint32 emote = atoi((char*)args); Creature* target = getSelectedCreature(); - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -4636,7 +4636,7 @@ bool ChatHandler::HandleNpcAddWeaponCommand(const char* /*args*/) Creature *pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(), guid); - if(!pCreature) + if (!pCreature) { SendSysMessage(LANG_SELECT_CREATURE); return true; @@ -4656,7 +4656,7 @@ bool ChatHandler::HandleNpcAddWeaponCommand(const char* /*args*/) ItemPrototype* tmpItem = objmgr.GetItemPrototype(ItemID); bool added = false; - if(tmpItem) + if (tmpItem) { switch(SlotID) { @@ -4678,7 +4678,7 @@ bool ChatHandler::HandleNpcAddWeaponCommand(const char* /*args*/) break; } - if(added) + if (added) PSendSysMessage(LANG_ITEM_ADDED_TO_SLOT,ItemID,tmpItem->Name1,SlotID); } else @@ -4755,19 +4755,19 @@ bool ChatHandler::HandleHoverCommand(const char *args) void ChatHandler::HandleCharacterLevel(Player* player, uint64 player_guid, uint32 oldlevel, uint32 newlevel) { - if(player) + if (player) { player->GiveLevel(newlevel); player->InitTalentForLevel(); player->SetUInt32Value(PLAYER_XP,0); - if(needReportToTarget(player)) + if (needReportToTarget(player)) { - if(oldlevel == newlevel) + if (oldlevel == newlevel) ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_PROGRESS_RESET,GetNameLink().c_str()); - else if(oldlevel < newlevel) + else if (oldlevel < newlevel) ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_UP,GetNameLink().c_str(),newlevel); - else // if(oldlevel > newlevel) + else // if (oldlevel > newlevel) ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_DOWN,GetNameLink().c_str(),newlevel); } } @@ -4783,11 +4783,11 @@ bool ChatHandler::HandleCharacterLevelCommand(const char *args) char* nameStr; char* levelStr; extractOptFirstArg((char*)args,&nameStr,&levelStr); - if(!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 @@ -4796,21 +4796,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); @@ -4826,7 +4826,7 @@ bool ChatHandler::HandleLevelUpCommand(const char *args) extractOptFirstArg((char*)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 @@ -4835,22 +4835,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); @@ -4876,7 +4876,7 @@ bool ChatHandler::HandleShowAreaCommand(const char *args) int offset = area / 32; uint32 val = (uint32)(1 << (area % 32)); - if(area<0 || offset >= 128) + if (area<0 || offset >= 128) { SendSysMessage(LANG_BAD_VALUE); SetSentErrorMessage(true); @@ -4907,7 +4907,7 @@ bool ChatHandler::HandleHideAreaCommand(const char *args) int offset = area / 32; uint32 val = (uint32)(1 << (area % 32)); - if(area<0 || offset >= 128) + if (area<0 || offset >= 128) { SendSysMessage(LANG_BAD_VALUE); SetSentErrorMessage(true); @@ -4930,7 +4930,7 @@ bool ChatHandler::HandleBankCommand(const char* /*args*/) bool ChatHandler::HandleChangeWeather(const char *args) { - if(!*args) + if (!*args) return false; //Weather is OFF @@ -4956,9 +4956,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); @@ -4972,11 +4972,11 @@ bool ChatHandler::HandleChangeWeather(const char *args) bool ChatHandler::HandleDebugSet32Bit(const char *args) { - if(!*args) + if (!*args) return false; WorldObject* target = getSelectedObject(); - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -5005,7 +5005,7 @@ bool ChatHandler::HandleDebugSet32Bit(const char *args) bool ChatHandler::HandleTeleAddCommand(const char * args) { - if(!*args) + if (!*args) return false; Player *player=m_session->GetPlayer(); @@ -5014,7 +5014,7 @@ bool ChatHandler::HandleTeleAddCommand(const char * args) std::string name = args; - if(objmgr.GetGameTele(name)) + if (objmgr.GetGameTele(name)) { SendSysMessage(LANG_COMMAND_TP_ALREADYEXIST); SetSentErrorMessage(true); @@ -5029,7 +5029,7 @@ bool ChatHandler::HandleTeleAddCommand(const char * args) tele.mapId = player->GetMapId(); tele.name = name; - if(objmgr.AddGameTele(tele)) + if (objmgr.AddGameTele(tele)) { SendSysMessage(LANG_COMMAND_TP_ADDED); } @@ -5045,12 +5045,12 @@ bool ChatHandler::HandleTeleAddCommand(const char * args) bool ChatHandler::HandleTeleDelCommand(const char * args) { - if(!*args) + if (!*args) return false; std::string name = args; - if(!objmgr.DeleteGameTele(name)) + if (!objmgr.DeleteGameTele(name)) { SendSysMessage(LANG_COMMAND_TELE_NOTFOUND); SetSentErrorMessage(true); @@ -5064,7 +5064,7 @@ bool ChatHandler::HandleTeleDelCommand(const char * args) bool ChatHandler::HandleListAurasCommand (const char * /*args*/) { Unit *unit = getSelectedUnit(); - if(!unit) + if (!unit) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -5134,7 +5134,7 @@ bool ChatHandler::HandleResetAchievementsCommand (const char * args) if (!extractPlayerTarget((char*)args,&target,&target_guid)) return false; - if(target) + if (target) target->GetAchievementMgr().Reset(); else AchievementMgr::DeleteFromDB(GUID_LOPART(target_guid)); @@ -5161,7 +5161,7 @@ bool ChatHandler::HandleResetHonorCommand (const char * args) static bool HandleResetStatsOrLevelHelper(Player* player) { ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(player->getClass()); - if(!cEntry) + if (!cEntry) { sLog.outError("Class %u not found in DBC (Wrong DBC files?)",player->getClass()); return false; @@ -5170,7 +5170,7 @@ static bool HandleResetStatsOrLevelHelper(Player* player) uint8 powertype = cEntry->powerType; // reset m_form if no aura - if(!player->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT)) + if (!player->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT)) player->m_form = FORM_NONE; player->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, DEFAULT_WORLD_OBJECT_SIZE ); @@ -5181,7 +5181,7 @@ static bool HandleResetStatsOrLevelHelper(Player* player) 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) + if (player->m_form==FORM_NONE) player->InitDisplayIds(); player->SetByteValue(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP ); @@ -5199,10 +5199,10 @@ static bool HandleResetStatsOrLevelHelper(Player* player) bool ChatHandler::HandleResetLevelCommand(const char * args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args,&target)) return false; - if(!HandleResetStatsOrLevelHelper(target)) + if (!HandleResetStatsOrLevelHelper(target)) return false; // set starting level @@ -5223,7 +5223,7 @@ 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; @@ -5252,15 +5252,15 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args) Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) return false; - if(target) + if (target) { target->resetSpells(/* bool myClassOnly */); ChatHandler(target).SendSysMessage(LANG_RESET_SPELLS); - if(!m_session || m_session->GetPlayer() != target) + if (!m_session || m_session->GetPlayer() != target) PSendSysMessage(LANG_RESET_SPELLS_ONLINE,GetNameLink(target).c_str()); } else @@ -5284,13 +5284,13 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) if (!*args && creature && creature->isPet()) { Unit *owner = creature->GetOwner(); - if(owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet *)creature)->IsPermanentPetFor(owner->ToPlayer())) + if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet *)creature)->IsPermanentPetFor(owner->ToPlayer())) { ((Pet *)creature)->resetTalents(true); owner->ToPlayer()->SendTalentsInfoData(true); ChatHandler(owner->ToPlayer()).SendSysMessage(LANG_RESET_PET_TALENTS); - if(!m_session || m_session->GetPlayer()!=owner->ToPlayer()) + if (!m_session || m_session->GetPlayer()!=owner->ToPlayer()) PSendSysMessage(LANG_RESET_PET_TALENTS_ONLINE,GetNameLink(owner->ToPlayer()).c_str()); } return true; @@ -5311,7 +5311,7 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) Pet* pet = target->GetPet(); Pet::resetTalentsForAllPetsOf(target,pet); - if(pet) + if (pet) target->SendTalentsInfoData(true); return true; } @@ -5331,7 +5331,7 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) bool ChatHandler::HandleResetAllCommand(const char * args) { - if(!*args) + if (!*args) return false; std::string casename = args; @@ -5339,18 +5339,18 @@ bool ChatHandler::HandleResetAllCommand(const char * args) AtLoginFlags atLogin; // Command specially created as single command to prevent using short case names - if(casename=="spells") + if (casename=="spells") { atLogin = AT_LOGIN_RESET_SPELLS; sWorld.SendWorldText(LANG_RESETALL_SPELLS); - if(!m_session) + if (!m_session) SendSysMessage(LANG_RESETALL_SPELLS); } - else if(casename=="talents") + else if (casename=="talents") { atLogin = AtLoginFlags(AT_LOGIN_RESET_TALENTS | AT_LOGIN_RESET_PET_TALENTS); sWorld.SendWorldText(LANG_RESETALL_TALENTS); - if(!m_session) + if (!m_session) SendSysMessage(LANG_RESETALL_TALENTS); } else @@ -5378,7 +5378,7 @@ bool ChatHandler::HandleServerShutDownCancelCommand(const char* /*args*/) bool ChatHandler::HandleServerShutDownCommand(const char *args) { - if(!*args) + if (!*args) return false; char* time_str = strtok ((char*) args, " "); @@ -5413,7 +5413,7 @@ bool ChatHandler::HandleServerShutDownCommand(const char *args) bool ChatHandler::HandleServerRestartCommand(const char *args) { - if(!*args) + if (!*args) return false; char* time_str = strtok ((char*) args, " "); @@ -5448,7 +5448,7 @@ bool ChatHandler::HandleServerRestartCommand(const char *args) bool ChatHandler::HandleServerIdleRestartCommand(const char *args) { - if(!*args) + if (!*args) return false; char* time_str = strtok ((char*) args, " "); @@ -5483,7 +5483,7 @@ bool ChatHandler::HandleServerIdleRestartCommand(const char *args) bool ChatHandler::HandleServerIdleShutDownCommand(const char *args) { - if(!*args) + if (!*args) return false; char* time_str = strtok ((char*) args, " "); @@ -5492,7 +5492,7 @@ bool ChatHandler::HandleServerIdleShutDownCommand(const char *args) 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) + if (time == 0 && (time_str[0]!='0' || time_str[1]!='\0') || time < 0) return false; if (exitcode_str) @@ -5519,7 +5519,7 @@ bool ChatHandler::HandleServerIdleShutDownCommand(const char *args) bool ChatHandler::HandleQuestAdd(const char *args) { Player* player = getSelectedPlayer(); - if(!player) + if (!player) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -5529,14 +5529,14 @@ 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) + if (!cId) return false; uint32 entry = atol(cId); Quest const* pQuest = objmgr.GetQuestTemplate(entry); - if(!pQuest) + if (!pQuest) { PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND,entry); SetSentErrorMessage(true); @@ -5559,7 +5559,7 @@ 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 ); @@ -5573,7 +5573,7 @@ bool ChatHandler::HandleQuestAdd(const char *args) bool ChatHandler::HandleQuestRemove(const char *args) { Player* player = getSelectedPlayer(); - if(!player) + if (!player) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -5583,14 +5583,14 @@ 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) + if (!cId) return false; uint32 entry = atol(cId); Quest const* pQuest = objmgr.GetQuestTemplate(entry); - if(!pQuest) + if (!pQuest) { PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry); SetSentErrorMessage(true); @@ -5601,7 +5601,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); @@ -5623,7 +5623,7 @@ bool ChatHandler::HandleQuestRemove(const char *args) bool ChatHandler::HandleQuestComplete(const char *args) { Player* player = getSelectedPlayer(); - if(!player) + if (!player) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -5633,7 +5633,7 @@ 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) + if (!cId) return false; uint32 entry = atol(cId); @@ -5641,7 +5641,7 @@ bool ChatHandler::HandleQuestComplete(const char *args) Quest const* pQuest = objmgr.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); @@ -5653,14 +5653,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); @@ -5673,18 +5673,18 @@ bool ChatHandler::HandleQuestComplete(const char *args) uint32 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,0,spell_id); } - else if(creature > 0) + else if (creature > 0) { - if(CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(creature)) + if (CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(creature)) for (uint16 z = 0; z < creaturecount; ++z) player->KilledMonster(cInfo,0); } - else if(creature < 0) + else if (creature < 0) { for (uint16 z = 0; z < creaturecount; ++z) player->CastedCreatureOrGO(creature,0,0); @@ -5692,28 +5692,28 @@ bool ChatHandler::HandleQuestComplete(const char *args) } // If the quest requires reputation to complete - if(uint32 repFaction = pQuest->GetRepObjectiveFaction()) + if (uint32 repFaction = pQuest->GetRepObjectiveFaction()) { 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 a SECOND reputation to complete - if(uint32 repFaction = pQuest->GetRepObjectiveFaction2()) + if (uint32 repFaction = pQuest->GetRepObjectiveFaction2()) { uint32 repValue2 = pQuest->GetRepObjectiveValue2(); uint32 curRep = player->GetReputationMgr().GetReputation(repFaction); - if(curRep < repValue2) - if(FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction)) + if (curRep < repValue2) + if (FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction)) player->GetReputationMgr().SetReputation(factionEntry,repValue2); } // If the quest requires money int32 ReqOrRewMoney = pQuest->GetRewOrReqMoney(); - if(ReqOrRewMoney < 0) + if (ReqOrRewMoney < 0) player->ModifyMoney(-ReqOrRewMoney); player->CompleteQuest(entry); @@ -5747,17 +5747,17 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) std::string nameOrIP = cnameOrIP; char* duration = strtok (NULL," "); - if(!duration || !atoi(duration)) + if (!duration || !atoi(duration)) return false; char* reason = strtok (NULL,""); - if(!reason) + if (!reason) return false; switch(mode) { case BAN_ACCOUNT: - if(!AccountMgr::normalizeString(nameOrIP)) + if (!AccountMgr::normalizeString(nameOrIP)) { PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str()); SetSentErrorMessage(true); @@ -5765,7 +5765,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) } break; case BAN_CHARACTER: - if(!normalizePlayerName(nameOrIP)) + if (!normalizePlayerName(nameOrIP)) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -5773,7 +5773,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) } break; case BAN_IP: - if(!IsIPAddress(nameOrIP.c_str())) + if (!IsIPAddress(nameOrIP.c_str())) return false; break; } @@ -5781,7 +5781,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) switch(sWorld.BanAccount(mode, nameOrIP, duration, reason,m_session ? m_session->GetPlayerName() : "")) { case BAN_SUCCESS: - if(atoi(duration)>0) + if (atoi(duration)>0) PSendSysMessage(LANG_BAN_YOUBANNED,nameOrIP.c_str(),secsToTimeString(TimeStringToSecs(duration),true).c_str(),reason); else PSendSysMessage(LANG_BAN_YOUPERMBANNED,nameOrIP.c_str(),reason); @@ -5829,7 +5829,7 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char *args) return false; char* cnameOrIP = strtok ((char*)args, " "); - if(!cnameOrIP) + if (!cnameOrIP) return false; std::string nameOrIP = cnameOrIP; @@ -5837,7 +5837,7 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char *args) switch(mode) { case BAN_ACCOUNT: - if(!AccountMgr::normalizeString(nameOrIP)) + if (!AccountMgr::normalizeString(nameOrIP)) { PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str()); SetSentErrorMessage(true); @@ -5845,7 +5845,7 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char *args) } break; case BAN_CHARACTER: - if(!normalizePlayerName(nameOrIP)) + if (!normalizePlayerName(nameOrIP)) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -5853,12 +5853,12 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char *args) } break; case BAN_IP: - if(!IsIPAddress(nameOrIP.c_str())) + if (!IsIPAddress(nameOrIP.c_str())) return false; break; } - if(sWorld.RemoveBanAccount(mode,nameOrIP)) + if (sWorld.RemoveBanAccount(mode,nameOrIP)) PSendSysMessage(LANG_UNBAN_UNBANNED,nameOrIP.c_str()); else PSendSysMessage(LANG_UNBAN_ERROR,nameOrIP.c_str()); @@ -5872,11 +5872,11 @@ bool ChatHandler::HandleBanInfoAccountCommand(const char *args) return false; char* cname = strtok((char*)args, ""); - if(!cname) + if (!cname) return false; std::string account_name = cname; - if(!AccountMgr::normalizeString(account_name)) + if (!AccountMgr::normalizeString(account_name)) { PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); SetSentErrorMessage(true); @@ -5884,7 +5884,7 @@ bool ChatHandler::HandleBanInfoAccountCommand(const char *args) } uint32 accountid = accmgr.GetId(account_name); - if(!accountid) + if (!accountid) { PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); return true; @@ -5897,13 +5897,13 @@ bool ChatHandler::HandleBanInfoCharacterCommand(const char *args) { Player* target; uint64 target_guid; - if(!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget((char*)args,&target,&target_guid)) return false; uint32 accountid = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid); std::string accountname; - if(!accmgr.GetName(accountid,accountname)) + if (!accmgr.GetName(accountid,accountname)) { PSendSysMessage(LANG_BANINFO_NOCHARACTER); return true; @@ -5915,7 +5915,7 @@ bool ChatHandler::HandleBanInfoCharacterCommand(const char *args) bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname) { QueryResult_AutoPtr result = loginDatabase.PQuery("SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate,banreason,bannedby FROM account_banned WHERE id = '%u' ORDER BY bandate ASC",accountid); - if(!result) + if (!result) { PSendSysMessage(LANG_BANINFO_NOACCOUNTBAN, accountname); return true; @@ -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); @@ -5945,7 +5945,7 @@ bool ChatHandler::HandleBanInfoIPCommand(const char *args) return false; char* cIP = strtok ((char*)args, ""); - if(!cIP) + if (!cIP) return false; if (!IsIPAddress(cIP)) @@ -5955,7 +5955,7 @@ bool ChatHandler::HandleBanInfoIPCommand(const char *args) loginDatabase.escape_string(IP); QueryResult_AutoPtr result = loginDatabase.PQuery("SELECT ip, FROM_UNIXTIME(bandate), FROM_UNIXTIME(unbandate), unbandate-UNIX_TIMESTAMP(), banreason,bannedby,unbandate-bandate FROM ip_banned WHERE ip = '%s'",IP.c_str()); - if(!result) + if (!result) { PSendSysMessage(LANG_BANINFO_NOIP); return true; @@ -5975,7 +5975,7 @@ bool ChatHandler::HandleBanListCharacterCommand(const char *args) loginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); char* cFilter = strtok ((char*)args, " "); - if(!cFilter) + if (!cFilter) return false; std::string filter = cFilter; @@ -6000,7 +6000,7 @@ bool ChatHandler::HandleBanListAccountCommand(const char *args) QueryResult_AutoPtr result; - if(filter.empty()) + if (filter.empty()) { result = loginDatabase.Query("SELECT account.id, username FROM account, account_banned" " WHERE account.id = account_banned.id AND active = 1 GROUP BY account.id"); @@ -6026,7 +6026,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult_AutoPtr result) PSendSysMessage(LANG_BANLIST_MATCHINGACCOUNT); // Chat short output - if(m_session) + if (m_session) { do { @@ -6034,7 +6034,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult_AutoPtr result) uint32 accountid = fields[0].GetUInt32(); QueryResult_AutoPtr banresult = loginDatabase.PQuery("SELECT account.username FROM account,account_banned WHERE account_banned.id='%u' AND account_banned.id=account.id",accountid); - if(banresult) + if (banresult) { Field* fields2 = banresult->Fetch(); PSendSysMessage("%s",fields2[0].GetString()); @@ -6056,7 +6056,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult_AutoPtr result) std::string account_name; // "account" case, name can be get in same query - if(result->GetFieldCount() > 1) + if (result->GetFieldCount() > 1) account_name = fields[1].GetCppString(); // "character" case, name need extract from another DB else @@ -6105,7 +6105,7 @@ bool ChatHandler::HandleBanListIPCommand(const char *args) QueryResult_AutoPtr result; - if(filter.empty()) + if (filter.empty()) { result = loginDatabase.Query ("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned" " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP())" @@ -6118,7 +6118,7 @@ bool ChatHandler::HandleBanListIPCommand(const char *args) " ORDER BY unbandate",filter.c_str() ); } - if(!result) + if (!result) { PSendSysMessage(LANG_BANLIST_NOIP); return true; @@ -6126,7 +6126,7 @@ bool ChatHandler::HandleBanListIPCommand(const char *args) PSendSysMessage(LANG_BANLIST_MATCHINGIP); // Chat short output - if(m_session) + if (m_session) { do { @@ -6174,16 +6174,16 @@ bool ChatHandler::HandleRespawnCommand(const char* /*args*/) // accept only explicitly selected target (not implicitly self targeting case) Unit* target = getSelectedUnit(); - if(pl->GetSelection() && target) + if (pl->GetSelection() && target) { - if(target->GetTypeId()!=TYPEID_UNIT || target->isPet()) + if (target->GetTypeId()!=TYPEID_UNIT || target->isPet()) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); return false; } - if(target->isDead()) + if (target->isDead()) target->ToCreature()->Respawn(); return true; } @@ -6234,15 +6234,15 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) return false; char * file = strtok((char*)args, " "); - if(!file) + if (!file) return false; char * account = strtok(NULL, " "); - if(!account) + if (!account) return false; std::string account_name = account; - if(!AccountMgr::normalizeString(account_name)) + if (!AccountMgr::normalizeString(account_name)) { PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); SetSentErrorMessage(true); @@ -6250,10 +6250,10 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) } uint32 account_id = accmgr.GetId(account_name); - if(!account_id) + if (!account_id) { account_id = atoi(account); // use original string - if(!account_id) + if (!account_id) { PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); SetSentErrorMessage(true); @@ -6261,7 +6261,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) } } - if(!accmgr.GetName(account_id,account_name)) + if (!accmgr.GetName(account_id,account_name)) { PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); SetSentErrorMessage(true); @@ -6347,7 +6347,7 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args) char* file = strtok((char*)args, " "); char* p2 = strtok(NULL, " "); - if(!file || !p2) + if (!file || !p2) return false; uint32 guid; @@ -6357,7 +6357,7 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args) else { std::string name = extractPlayerNameFromLink(p2); - if(name.empty()) + if (name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -6367,7 +6367,7 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args) guid = objmgr.GetPlayerGUIDByName(name); } - if(!objmgr.GetPlayerAccountIdByGUID(guid)) + if (!objmgr.GetPlayerAccountIdByGUID(guid)) { PSendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -6395,7 +6395,7 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args) bool ChatHandler::HandleMovegensCommand(const char* /*args*/) { Unit* unit = getSelectedUnit(); - if(!unit) + if (!unit) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -6408,7 +6408,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) for (uint8 i = 0; i < MAX_MOTION_SLOT; ++i) { MovementGenerator* mg = mm->GetMotionSlot(i); - if(!mg) + if (!mg) { SendSysMessage("Empty"); continue; @@ -6422,11 +6422,11 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) case CONFUSED_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_CONFUSED); break; case TARGETED_MOTION_TYPE: { - if(unit->GetTypeId() == TYPEID_PLAYER) + if (unit->GetTypeId() == TYPEID_PLAYER) { TargetedMovementGenerator<Player> const* mgen = static_cast<TargetedMovementGenerator<Player> const*>(mg); Unit* target = mgen->GetTarget(); - if(target) + if (target) PSendSysMessage(LANG_MOVEGENS_TARGETED_PLAYER,target->GetName(),target->GetGUIDLow()); else SendSysMessage(LANG_MOVEGENS_TARGETED_NULL); @@ -6435,7 +6435,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) { TargetedMovementGenerator<Creature> const* mgen = static_cast<TargetedMovementGenerator<Creature> const*>(mg); Unit* target = mgen->GetTarget(); - if(target) + if (target) PSendSysMessage(LANG_MOVEGENS_TARGETED_CREATURE,target->GetName(),target->GetGUIDLow()); else SendSysMessage(LANG_MOVEGENS_TARGETED_NULL); @@ -6443,7 +6443,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) break; } case HOME_MOTION_TYPE: - if(unit->GetTypeId() == TYPEID_UNIT) + if (unit->GetTypeId() == TYPEID_UNIT) { float x,y,z; mg->GetDestination(x,y,z); @@ -6472,34 +6472,34 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) bool ChatHandler::HandleServerPLimitCommand(const char *args) { - if(*args) + if (*args) { char* param = strtok((char*)args, " "); - if(!param) + if (!param) return false; 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 ) + else if (strncmp(param,"reset",l) == 0 ) sWorld.SetPlayerLimit( sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT) ); else { int val = atoi(param); - if(val < -SEC_ADMINISTRATOR) val = -SEC_ADMINISTRATOR; + if (val < -SEC_ADMINISTRATOR) val = -SEC_ADMINISTRATOR; sWorld.SetPlayerLimit(val); } // kick all low security level players - if(sWorld.GetPlayerAmountLimit() > SEC_PLAYER) + if (sWorld.GetPlayerAmountLimit() > SEC_PLAYER) sWorld.KickAllLess(sWorld.GetPlayerSecurityLimit()); } @@ -6522,12 +6522,12 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args) bool ChatHandler::HandleCastCommand(const char *args) { - if(!*args) + if (!*args) return false; Unit* target = getSelectedUnit(); - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -6536,14 +6536,14 @@ 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) + 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); @@ -6551,10 +6551,10 @@ bool ChatHandler::HandleCastCommand(const char *args) } 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; } @@ -6569,7 +6569,7 @@ bool ChatHandler::HandleCastBackCommand(const char *args) { Creature* caster = getSelectedCreature(); - if(!caster) + if (!caster) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -6579,14 +6579,14 @@ 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)) + 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; } @@ -6601,19 +6601,19 @@ bool ChatHandler::HandleCastBackCommand(const char *args) bool ChatHandler::HandleCastDistCommand(const 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) + 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); @@ -6624,14 +6624,14 @@ bool ChatHandler::HandleCastDistCommand(const char *args) float dist = 0; - if(distStr) + if (distStr) sscanf(distStr, "%f", &dist); 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; } @@ -6648,14 +6648,14 @@ bool ChatHandler::HandleCastTargetCommand(const 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); @@ -6664,14 +6664,14 @@ 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)) + 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; } @@ -6693,13 +6693,13 @@ bool ChatHandler::HandleComeToMeCommand(const char *args) { char* newFlagStr = strtok((char*)args, " "); - if(!newFlagStr) + if (!newFlagStr) return false; uint32 newFlags = (uint32)strtoul(newFlagStr, NULL, 0); Creature* caster = getSelectedCreature(); - if(!caster) + if (!caster) { m_session->GetPlayer()->SetUnitMovementFlags(newFlags); SendSysMessage(LANG_SELECT_CREATURE); @@ -6717,12 +6717,12 @@ bool ChatHandler::HandleComeToMeCommand(const char *args) bool ChatHandler::HandleCastSelfCommand(const char *args) { - if(!*args) + if (!*args) return false; Unit* target = getSelectedUnit(); - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); SetSentErrorMessage(true); @@ -6731,14 +6731,14 @@ 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) + 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); @@ -6754,8 +6754,8 @@ std::string GetTimeString(uint32 time) { uint16 days = time / DAY, hours = (time % DAY) / HOUR, minute = (time % HOUR) / MINUTE; std::ostringstream ss; - if(days) ss << days << "d "; - if(hours) ss << hours << "h "; + if (days) ss << days << "d "; + if (hours) ss << hours << "h "; ss << minute << "m"; return ss.str(); } @@ -6779,7 +6779,7 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/) PSendSysMessage("player binds: %d", counter); counter = 0; Group *group = player->GetGroup(); - if(group) + if (group) { for (uint8 i = 0; i < MAX_DIFFICULTY; ++i) { @@ -6799,11 +6799,11 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/) bool ChatHandler::HandleInstanceUnbindCommand(const char *args) { - if(!*args) + if (!*args) return false; std::string cmd = args; - if(cmd == "all") + if (cmd == "all") { Player* player = getSelectedPlayer(); if (!player) player = m_session->GetPlayer(); @@ -6813,7 +6813,7 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char *args) Player::BoundInstancesMap &binds = player->GetBoundInstances(Difficulty(i)); for (Player::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end();) { - if(itr->first != player->GetMapId()) + if (itr->first != player->GetMapId()) { InstanceSave *save = itr->second.save; std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL)); @@ -6868,7 +6868,7 @@ bool ChatHandler::HandleGMListFullCommand(const char* /*args*/) { ///- Get the accounts with GM Level >0 QueryResult_AutoPtr result = loginDatabase.Query("SELECT a.username,aa.gmlevel FROM account a, account_access aa WHERE a.id=aa.id AND aa.gmlevel > 0"); - if(result) + if (result) { SendSysMessage(LANG_GMLIST); SendSysMessage("========================"); @@ -6902,13 +6902,13 @@ bool ChatHandler::HandleServerSetClosedCommand(const char *args) { std::string arg = args; - if(args == "on") + if (args == "on") { SendSysMessage(LANG_WORLD_CLOSED); sWorld.SetClosed(true); return true; } - if(args == "off") + if (args == "off") { SendSysMessage(LANG_WORLD_OPENED); sWorld.SetClosed(false); @@ -6927,16 +6927,16 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char *args) char *szAcc = strtok((char*)args," "); char *szExp = strtok(NULL," "); - if(!szAcc) + if (!szAcc) return false; std::string account_name; uint32 account_id; - if(!szExp) + if (!szExp) { Player* player = getSelectedPlayer(); - if(!player) + if (!player) return false; account_id = player->GetSession()->GetAccountId(); @@ -6947,7 +6947,7 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char *args) { ///- Convert Account name to Upper Format account_name = szAcc; - if(!AccountMgr::normalizeString(account_name)) + if (!AccountMgr::normalizeString(account_name)) { PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); SetSentErrorMessage(true); @@ -6955,7 +6955,7 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char *args) } account_id = accmgr.GetId(account_name); - if(!account_id) + if (!account_id) { PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); SetSentErrorMessage(true); @@ -6971,7 +6971,7 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char *args) return false; int expansion = atoi(szExp); //get int anyway (0 if error) - if(expansion < 0 || expansion > sWorld.getConfig(CONFIG_EXPANSION)) + if (expansion < 0 || expansion > sWorld.getConfig(CONFIG_EXPANSION)) return false; // No SQL injection @@ -6987,11 +6987,11 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) Player* receiver; uint64 receiver_guid; std::string receiver_name; - if(!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name)) + if (!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name)) return false; char* tail1 = strtok(NULL, ""); - if(!tail1) + if (!tail1) return false; char* msgSubject = extractQuotedArg(tail1); @@ -6999,7 +6999,7 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) return false; char* tail2 = strtok(NULL, ""); - if(!tail2) + if (!tail2) return false; char* msgText = extractQuotedArg(tail2); @@ -7029,11 +7029,11 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) char* itemCountStr = strtok(NULL, " "); uint32 item_id = atoi(itemIdStr); - if(!item_id) + if (!item_id) return false; ItemPrototype const* item_proto = objmgr.GetItemPrototype(item_id); - if(!item_proto) + if (!item_proto) { PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id); SetSentErrorMessage(true); @@ -7056,7 +7056,7 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) items.push_back(ItemPair(item_id,item_count)); - if(items.size() > MAX_MAIL_ITEMS) + if (items.size() > MAX_MAIL_ITEMS) { PSendSysMessage(LANG_COMMAND_MAIL_ITEMS_LIMIT, MAX_MAIL_ITEMS); SetSentErrorMessage(true); @@ -7074,7 +7074,7 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) for (ItemPairs::const_iterator itr = items.begin(); itr != items.end(); ++itr) { - if(Item* item = Item::CreateItem(itr->first,itr->second,m_session ? m_session->GetPlayer() : 0)) + if (Item* item = Item::CreateItem(itr->first,itr->second,m_session ? m_session->GetPlayer() : 0)) { item->SaveToDB(); // save for prevent lost at next mail load, if send fail then item will deleted draft.AddItem(item); @@ -7096,7 +7096,7 @@ bool ChatHandler::HandleSendMoneyCommand(const char *args) Player* receiver; uint64 receiver_guid; std::string receiver_name; - if(!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name)) + if (!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name)) return false; char* tail1 = strtok(NULL, ""); @@ -7190,7 +7190,7 @@ bool ChatHandler::HandleModifyGenderCommand(const char *args) } PlayerInfo const* info = objmgr.GetPlayerInfo(player->getRace(), player->getClass()); - if(!info) + if (!info) return false; char const* gender_str = (char*)args; @@ -7198,7 +7198,7 @@ bool ChatHandler::HandleModifyGenderCommand(const char *args) 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; @@ -7238,12 +7238,12 @@ bool ChatHandler::HandleModifyGenderCommand(const char *args) bool ChatHandler::HandleChannelSetPublic(const char *args) { - if(!*args) + if (!*args) return false; std::string channel = strtok((char*)args, " "); uint32 val = atoi((char*)args); - if(val) + if (val) { CharacterDatabase.PExecute("UPDATE channels SET m_public = 1 WHERE m_name LIKE '%s'", channel); val = 1; |