diff options
46 files changed, 219 insertions, 222 deletions
diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index d75d32d7c6d..12f3f76c069 100755 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -307,7 +307,7 @@ void VehicleAI::LoadConditions() void VehicleAI::CheckConditions(const uint32 diff) { - if(m_ConditionsTimer < diff) + if (m_ConditionsTimer < diff) { if (!conditions.empty()) { diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 48958f55ed0..470b4623ea2 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -676,7 +676,7 @@ void WorldBossAI::JustSummoned(Creature* summon) { summons.Summon(summon); Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); - if(target) + if (target) summon->AI()->AttackStart(target); } diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 4221daeb821..5897a4f1476 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -215,10 +215,10 @@ void SmartAI::EndPath(bool fail) if (targets->size() == 1 && GetScript()->IsPlayer((*targets->begin()))) { Player* plr = (*targets->begin())->ToPlayer(); - if(!fail && plr->IsAtGroupRewardDistance(me) && !plr->GetCorpse()) + if (!fail && plr->IsAtGroupRewardDistance(me) && !plr->GetCorpse()) plr->GroupEventHappens(mEscortQuestID, me); - if(fail && plr->GetQuestStatus(mEscortQuestID) == QUEST_STATUS_INCOMPLETE) + if (fail && plr->GetQuestStatus(mEscortQuestID) == QUEST_STATUS_INCOMPLETE) plr->FailQuest(mEscortQuestID); if (Group* pGroup = plr->GetGroup()) @@ -227,9 +227,9 @@ void SmartAI::EndPath(bool fail) { Player* pGroupGuy = gr->getSource(); - if(!fail && pGroupGuy->IsAtGroupRewardDistance(me) && !pGroupGuy->GetCorpse()) + if (!fail && pGroupGuy->IsAtGroupRewardDistance(me) && !pGroupGuy->GetCorpse()) pGroupGuy->AreaExploredOrEventHappens(mEscortQuestID); - if(fail && pGroupGuy->GetQuestStatus(mEscortQuestID) == QUEST_STATUS_INCOMPLETE) + if (fail && pGroupGuy->GetQuestStatus(mEscortQuestID) == QUEST_STATUS_INCOMPLETE) pGroupGuy->FailQuest(mEscortQuestID); } } @@ -240,9 +240,9 @@ void SmartAI::EndPath(bool fail) if (GetScript()->IsPlayer((*iter))) { Player* plr = (*iter)->ToPlayer(); - if(!fail && plr->IsAtGroupRewardDistance(me) && !plr->GetCorpse()) + if (!fail && plr->IsAtGroupRewardDistance(me) && !plr->GetCorpse()) plr->AreaExploredOrEventHappens(mEscortQuestID); - if(fail && plr->GetQuestStatus(mEscortQuestID) == QUEST_STATUS_INCOMPLETE) + if (fail && plr->GetQuestStatus(mEscortQuestID) == QUEST_STATUS_INCOMPLETE) plr->FailQuest(mEscortQuestID); } } @@ -374,7 +374,7 @@ void SmartAI::UpdateAI(const uint32 diff) if (!UpdateVictim()) return; - if(mCanAutoAttack) + if (mCanAutoAttack) DoMeleeAttackIfReady(); } diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index ff6ac09bafc..2a9806129af 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -934,7 +934,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u return; for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) { - if(!IsUnit((*itr))) continue; + if (!IsUnit((*itr))) + continue; if (e.action.morphOrMount.creature || e.action.morphOrMount.model) { if (e.action.morphOrMount.creature > 0) @@ -1307,7 +1308,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) { - if(Creature* npc = (*itr)->ToCreature()) + if (Creature* npc = (*itr)->ToCreature()) { uint32 slot[3]; if (e.action.equip.entry) @@ -1930,7 +1931,7 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* ObjectList* units = GetWorldObjectsInDist((float)e.target.goRange.maxDist); for (ObjectList::const_iterator itr = units->begin(); itr != units->end(); ++itr) { - if(!IsGameObject(*itr)) + if (!IsGameObject(*itr)) continue; if (go && go == *itr) @@ -2098,13 +2099,13 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui ProcessAction(e); break; case SMART_EVENT_UPDATE_OOC: - if(me && me->isInCombat()) + if (me && me->isInCombat()) return; RecalcTimer(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax); ProcessAction(e); break; case SMART_EVENT_UPDATE_IC: - if(!me || !me->isInCombat()) + if (!me || !me->isInCombat()) return; RecalcTimer(e, e.event.minMaxRepeat.repeatMin, e.event.minMaxRepeat.repeatMax); ProcessAction(e); @@ -2734,7 +2735,7 @@ void SmartScript::OnMoveInLineOfSight(Unit* who) { ProcessEventsFor(SMART_EVENT_OOC_LOS, who); - if(!me) return; + if (!me) return; if (me->getVictim()) return; diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index 2d0475b1ec6..4fc70ed33ea 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -145,7 +145,7 @@ class SmartScript ObjectList* GetTargetList(uint32 id) { ObjectListMap::iterator itr = mTargetStorage->find(id); - if(itr != mTargetStorage->end()) + if (itr != mTargetStorage->end()) return (*itr).second; return NULL; } @@ -216,7 +216,7 @@ class SmartScript private: void IncPhase(int32 p = 1) { - if(p >= 0) + if (p >= 0) mEventPhase += (uint32)p; else DecPhase(abs(p)); diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 239876a24d0..7db67af6edc 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -1214,7 +1214,7 @@ class SmartAIMgr return mEventMap[uint32(type)][entry]; else { - if(entry > 0)//first search is for guid (negative), do not drop error if not found + if (entry > 0)//first search is for guid (negative), do not drop error if not found sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartAIMgr::GetScript: Could not load Script for Entry %d ScriptType %u.", entry, uint32(type)); return temp; } diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index 8281542ef42..756360518f7 100755 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -564,7 +564,7 @@ uint32 ArenaTeam::GetPoints(uint32 memberRating) points = 1511.26f / (1.0f + 1639.28f * exp(-0.00412f * (float)rating)); // Type penalties for teams < 5v5 - if (Type == ARENA_TEAM_2v2) + if (Type == ARENA_TEAM_2v2) points *= 0.76f; else if (Type == ARENA_TEAM_3v3) points *= 0.88f; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index 307c7df51d7..eb645a221d4 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -379,7 +379,7 @@ void BattlegroundAB::_NodeOccupied(uint8 node, Team team) if (capturedNodes >= 4) CastSpellOnTeam(SPELL_AB_QUEST_REWARD_4_BASES, team); - if(node >= BG_AB_DYNAMIC_NODES_COUNT)//only dynamic nodes, no start points + if (node >= BG_AB_DYNAMIC_NODES_COUNT)//only dynamic nodes, no start points return; Creature* trigger = GetBGCreature(node+7);//0-6 spirit guides if (!trigger) @@ -401,7 +401,7 @@ void BattlegroundAB::_NodeDeOccupied(uint8 node) return; //remove bonus honor aura trigger creature when node is lost - if(node < BG_AB_DYNAMIC_NODES_COUNT)//only dynamic nodes, no start points + if (node < BG_AB_DYNAMIC_NODES_COUNT)//only dynamic nodes, no start points DelCreature(node+7);//NULL checks are in DelCreature! 0-6 spirit guides // Those who are waiting to resurrect at this node are taken to the closest own node's graveyard diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index e87b4478b05..f16d719cd9d 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -789,7 +789,7 @@ void BattlegroundAV::DePopulateNode(BG_AV_Nodes node) DelCreature(node); //remove bonus honor aura trigger creature when node is lost - if(node < BG_AV_NODES_MAX)//fail safe + if (node < BG_AV_NODES_MAX)//fail safe DelCreature(node + 302);//NULL checks are in DelCreature! 0-302 spirit guides } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index 56994f15f2e..8135beb5c92 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -631,7 +631,7 @@ void BattlegroundIC::HandleContestedNodes(ICNodePoint* nodePoint) void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) { - if(nodePoint->nodeType != NODE_TYPE_REFINERY && nodePoint->nodeType != NODE_TYPE_QUARRY) + if (nodePoint->nodeType != NODE_TYPE_REFINERY && nodePoint->nodeType != NODE_TYPE_QUARRY) { if (!AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+nodePoint->nodeType-2, BG_IC_SpiritGuidePos[nodePoint->nodeType][0], BG_IC_SpiritGuidePos[nodePoint->nodeType][1], diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index d1c5aa78cd5..5119c473478 100755 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -205,11 +205,11 @@ void Channel::Join(uint64 p, const char *pass) if (!IsConstant()) { // Update last_used timestamp in db - if(!players.empty()) + if (!players.empty()) UpdateChannelUseageInDB(); // If the channel has no owner yet and ownership is allowed, set the new owner. - if ( !m_ownerGUID && m_ownership) + if (!m_ownerGUID && m_ownership) { SetOwner(p, (players.size() > 1 ? true : false)); players[p].SetModerator(true); diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp index baef423e832..6ab312b549c 100755 --- a/src/server/game/Chat/Commands/Level1.cpp +++ b/src/server/game/Chat/Commands/Level1.cpp @@ -177,9 +177,9 @@ bool ChatHandler::HandleGPSCommand(const char* args) uint32 have_map = Map::ExistMap(obj->GetMapId(), gx, gy) ? 1 : 0; uint32 have_vmap = Map::ExistVMap(obj->GetMapId(), gx, gy) ? 1 : 0; - if(have_vmap) + if (have_vmap) { - if(map->IsOutdoors(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ())) + if (map->IsOutdoors(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ())) PSendSysMessage("You are outdoors"); else PSendSysMessage("You are indoors"); diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index 7572b9c1a50..93347163b92 100755 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -441,10 +441,10 @@ bool ChatHandler::HandleCharacterChangeFactionCommand(const char * args) 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) { // TODO : add text into database PSendSysMessage(LANG_CUSTOMIZE_PLAYER, GetNameLink(target).c_str()); @@ -468,10 +468,10 @@ bool ChatHandler::HandleCharacterChangeRaceCommand(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) { // TODO : add text into database PSendSysMessage(LANG_CUSTOMIZE_PLAYER, GetNameLink(target).c_str()); diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index 744852f64a8..94a9c592793 100755 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -728,7 +728,7 @@ bool ChatHandler::HandleListCreatureCommand(const char *args) float z = fields[3].GetFloat(); int mapid = fields[4].GetUInt16(); - if (m_session) + if (m_session) PSendSysMessage(LANG_CREATURE_LIST_CHAT, guid, guid, cInfo->Name.c_str(), x, y, z, mapid); else PSendSysMessage(LANG_CREATURE_LIST_CONSOLE, guid, cInfo->Name.c_str(), x, y, z, mapid); @@ -4113,13 +4113,13 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char *args) return false; } - for(uint8 i = 0; i < MAX_DIFFICULTY; ++i) + for (uint8 i = 0; i < MAX_DIFFICULTY; ++i) { Player::BoundInstancesMap &binds = player->GetBoundInstances(Difficulty(i)); - for(Player::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end();) + for (Player::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end();) { InstanceSave *save = itr->second.save; - if(itr->first != player->GetMapId() && (!MapId || MapId == itr->first) && (diff == -1 || diff == save->GetDifficulty())) + if (itr->first != player->GetMapId() && (!MapId || MapId == itr->first) && (diff == -1 || diff == save->GetDifficulty())) { std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL)); PSendSysMessage("unbinding map: %d inst: %d perm: %s diff: %d canReset: %s TTR: %s", itr->first, save->GetInstanceId(), itr->second.perm ? "yes" : "no", save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str()); @@ -4414,7 +4414,7 @@ bool ChatHandler::HandleChannelSetOwnership(const char *args) if (strcmp(argstr, "on") == 0) { - if(chn) + if (chn) chn->SetOwnership(true); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SET_CHANNEL_OWNERSHIP); stmt->setUInt8 (0, 1); @@ -4424,7 +4424,7 @@ bool ChatHandler::HandleChannelSetOwnership(const char *args) } else if (strcmp(argstr, "off") == 0) { - if(chn) + if (chn) chn->SetOwnership(false); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SET_CHANNEL_OWNERSHIP); stmt->setUInt8 (0, 0); diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index ae0cf87bcec..beeb06baca8 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -271,7 +271,7 @@ bool ConditionMgr::IsPlayerMeetToConditionList(Player* player, ConditionList con ConditionReferenceMap::const_iterator ref = m_ConditionReferenceMap.find((*i)->mReferenceId); if (ref != m_ConditionReferenceMap.end()) { - if(!IsPlayerMeetToConditionList(player, (*ref).second, invoker)) + if (!IsPlayerMeetToConditionList(player, (*ref).second, invoker)) ElseGroupMap[(*i)->mElseGroup] = false; } else diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 6eddf396d45..9e6ed638f59 100755 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -592,8 +592,8 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales, bad_dbc_files, sVehicleSeatStore, dbcPath, "VehicleSeat.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sWMOAreaTableStore, dbcPath, "WMOAreaTable.dbc"); - for(uint32 i = 0; i < sWMOAreaTableStore.GetNumRows(); ++i) - if(WMOAreaTableEntry const* entry = sWMOAreaTableStore.LookupEntry(i)) + for (uint32 i = 0; i < sWMOAreaTableStore.GetNumRows(); ++i) + if (WMOAreaTableEntry const* entry = sWMOAreaTableStore.LookupEntry(i)) sWMOAreaInfoByTripple.insert(WMOAreaInfoByTripple::value_type(WMOAreaTableTripple(entry->rootId, entry->adtId, entry->groupId), entry)); LoadDBC(availableDbcLocales, bad_dbc_files, sWorldMapAreaStore, dbcPath, "WorldMapArea.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sWorldMapOverlayStore, dbcPath, "WorldMapOverlay.dbc"); @@ -680,7 +680,7 @@ int32 GetAreaFlagByAreaID(uint32 area_id) WMOAreaTableEntry const* GetWMOAreaTableEntryByTripple(int32 rootid, int32 adtid, int32 groupid) { WMOAreaInfoByTripple::iterator i = sWMOAreaInfoByTripple.find(WMOAreaTableTripple(rootid, adtid, groupid)); - if(i == sWMOAreaInfoByTripple.end()) + if (i == sWMOAreaInfoByTripple.end()) return NULL; return i->second; } diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index c8a3b7a81b0..96740ba2a2c 100755 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1152,7 +1152,7 @@ void LFGMgr::GetCompatibleDungeons(LfgDungeonSet& dungeons, const PlayerSet& pla { uint64 guid = (*it)->GetGUID(); LfgLockMap cachedLockMap = GetLockedDungeons(guid); - for(LfgLockMap::const_iterator it = cachedLockMap.begin(); it != cachedLockMap.end() && dungeons.size(); ++it) + for (LfgLockMap::const_iterator it = cachedLockMap.begin(); it != cachedLockMap.end() && dungeons.size(); ++it) { uint32 dungeonId = (it->first & 0x00FFFFFF); // Compare dungeon ids LfgDungeonSet::iterator itDungeon = dungeons.find(dungeonId); diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 6188c67f64f..f731ba69a54 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -78,7 +78,7 @@ bool VendorItemData::RemoveItem(uint32 item_id) VendorItem const* VendorItemData::FindItemCostPair(uint32 item_id, uint32 extendedCost) const { for (VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i) - if((*i)->item == item_id && (*i)->ExtendedCost == extendedCost) + if ((*i)->item == item_id && (*i)->ExtendedCost == extendedCost) return *i; return NULL; } @@ -241,7 +241,7 @@ void Creature::RemoveCorpse(bool setSpawnTime) AI()->CorpseRemoved(respawnDelay); // Should get removed later, just keep "compatibility" with scripts - if(setSpawnTime) + if (setSpawnTime) m_respawnTime = time(NULL) + respawnDelay; float x, y, z, o; @@ -2252,7 +2252,7 @@ void Creature::AllLootRemovedFromCorpse() if (!HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE)) { time_t now = time(NULL); - if(m_corpseRemoveTime <= now) + if (m_corpseRemoveTime <= now) return; float decayRate; diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index 99dbe49d0d6..54da5ed3bb9 100755 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -254,7 +254,7 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote eEmote, const std::string& Title data << uint32(eEmote._Emote); // NPC emote size_t count_pos = data.wpos(); - data << uint8 ( _questMenu.GetMenuItemCount()); + data << uint8 (_questMenu.GetMenuItemCount()); uint32 count = 0; for (; count < _questMenu.GetMenuItemCount(); ++count) { diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index dae77ac300e..c3ee0df326c 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -232,13 +232,13 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa case GAMEOBJECT_TYPE_TRAP: if (GetGOInfo()->trap.stealthed) { - m_stealth.AddFlag( STEALTH_TRAP); + m_stealth.AddFlag(STEALTH_TRAP); m_stealth.AddValue(STEALTH_TRAP, 300); } if (GetGOInfo()->trap.invisible) { - m_invisibility.AddFlag( INVISIBILITY_TRAP); + m_invisibility.AddFlag(INVISIBILITY_TRAP); m_invisibility.AddValue(INVISIBILITY_TRAP, 70); } @@ -255,7 +255,7 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa void GameObject::Update(uint32 diff) { - if(!AI()) + if (!AI()) { if (!AIM_Initialize()) sLog->outError("Could not initialize GameObjectAI"); @@ -1523,10 +1523,10 @@ void GameObject::Use(Unit* user) if (player->CanUseBattlegroundObject()) { // in battleground check - Battleground *bg = player->GetBattleground(); + Battleground* bg = player->GetBattleground(); if (!bg) return; - if( player->GetVehicle()) + if (player->GetVehicle()) return; // BG flag dropped // WS: @@ -1589,7 +1589,7 @@ void GameObject::Use(Unit* user) if (!spellId) return; - SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); + SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId); if (!spellInfo) { if (user->GetTypeId() != TYPEID_PLAYER || !sOutdoorPvPMgr->HandleCustomSpell(user->ToPlayer(), spellId, this)) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index ed33ccc5f7a..8694ac65eeb 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1520,7 +1520,7 @@ bool Position::HasInArc(float arc, const Position *obj) const // move angle to range -pi ... +pi angle = MapManager::NormalizeOrientation(angle); - if(angle > M_PI) + if (angle > M_PI) angle -= 2.0f*M_PI; float lborder = -1 * (arc/2.0f); // in range -pi..0 diff --git a/src/server/game/Entities/Object/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp index d7b8ede76f6..e90e21eb2df 100755 --- a/src/server/game/Entities/Object/ObjectPosSelector.cpp +++ b/src/server/game/Entities/Object/ObjectPosSelector.cpp @@ -39,12 +39,12 @@ ObjectPosSelector::ObjectPosSelector(float x, float y, float size, float dist) ObjectPosSelector::UsedPosList::value_type const* ObjectPosSelector::nextUsedPos(UsedPosType uptype) { UsedPosList::const_iterator itr = m_nextUsedPos[uptype]; - if(itr!=m_UsedPosLists[uptype].end()) + if (itr!=m_UsedPosLists[uptype].end()) ++itr; - if(itr==m_UsedPosLists[uptype].end()) + if (itr==m_UsedPosLists[uptype].end()) { - if(!m_UsedPosLists[~uptype].empty()) + if (!m_UsedPosLists[~uptype].empty()) return &*m_UsedPosLists[~uptype].rbegin(); else return NULL; @@ -55,7 +55,7 @@ ObjectPosSelector::UsedPosList::value_type const* ObjectPosSelector::nextUsedPos void ObjectPosSelector::AddUsedPos(float size, float angle, float dist) { - if(angle>=0) + if (angle>=0) m_UsedPosLists[USED_POS_PLUS].insert(UsedPosList::value_type(angle, UsedPos(1.0, size, dist))); else m_UsedPosLists[USED_POS_MINUS].insert(UsedPosList::value_type(-angle, UsedPos(-1.0, size, dist))); @@ -75,9 +75,9 @@ void ObjectPosSelector::InitializeAngle() bool ObjectPosSelector::FirstAngle(float& angle) { - if(m_UsedPosLists[USED_POS_PLUS].empty() && !m_UsedPosLists[USED_POS_MINUS].empty() ) + if (m_UsedPosLists[USED_POS_PLUS].empty() && !m_UsedPosLists[USED_POS_MINUS].empty() ) return NextAngleFor(*m_UsedPosLists[USED_POS_MINUS].begin(), 1.0, USED_POS_PLUS, angle); - else if(m_UsedPosLists[USED_POS_MINUS].empty() && !m_UsedPosLists[USED_POS_PLUS].empty() ) + else if (m_UsedPosLists[USED_POS_MINUS].empty() && !m_UsedPosLists[USED_POS_PLUS].empty() ) return NextAngleFor(*m_UsedPosLists[USED_POS_PLUS].begin(), -1.0, USED_POS_MINUS, angle); return false; @@ -90,7 +90,7 @@ bool ObjectPosSelector::NextAngle(float& angle) m_smallStepOk[USED_POS_PLUS] || m_smallStepOk[USED_POS_MINUS] ) { // calculate next possible angle - if(NextPosibleAngle(angle)) + if (NextPosibleAngle(angle)) return true; } @@ -103,53 +103,49 @@ bool ObjectPosSelector::NextUsedAngle(float& angle) m_nextUsedPos[USED_POS_MINUS]!=m_UsedPosLists[USED_POS_MINUS].end() ) { // calculate next possible angle - if(!NextPosibleAngle(angle)) + if (!NextPosibleAngle(angle)) return true; } return false; } -bool ObjectPosSelector::NextPosibleAngle( float& angle ) +bool ObjectPosSelector::NextPosibleAngle(float& angle) { // ++ direction less updated - if( m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() && + if (m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() && (m_nextUsedPos[USED_POS_MINUS]==m_UsedPosLists[USED_POS_MINUS].end() || m_nextUsedPos[USED_POS_PLUS]->first <= m_nextUsedPos[USED_POS_MINUS]->first) ) { bool ok; - if(m_smallStepOk[USED_POS_PLUS]) + if (m_smallStepOk[USED_POS_PLUS]) ok = NextSmallStepAngle(1.0, USED_POS_PLUS, angle); else ok = NextAngleFor(*m_nextUsedPos[USED_POS_PLUS], 1.0, USED_POS_PLUS, angle); - if(!ok) + if (!ok) ++m_nextUsedPos[USED_POS_PLUS]; // increase. only at fail (original or checked) return ok; } // -- direction less updated - else if( m_nextUsedPos[USED_POS_MINUS]!=m_UsedPosLists[USED_POS_MINUS].end()) + else if (m_nextUsedPos[USED_POS_MINUS]!=m_UsedPosLists[USED_POS_MINUS].end()) { bool ok; - if(m_smallStepOk[USED_POS_MINUS]) + if (m_smallStepOk[USED_POS_MINUS]) ok = NextSmallStepAngle(-1.0, USED_POS_MINUS, angle); else ok = NextAngleFor(*m_nextUsedPos[USED_POS_MINUS], -1.0, USED_POS_MINUS, angle); - if(!ok) + if (!ok) ++m_nextUsedPos[USED_POS_MINUS]; return ok; } else // both list empty { - if( m_smallStepOk[USED_POS_PLUS] && (!m_smallStepOk[USED_POS_MINUS] || m_smallStepAngle[USED_POS_PLUS] <= m_smallStepAngle[USED_POS_MINUS]) ) - { + if (m_smallStepOk[USED_POS_PLUS] && (!m_smallStepOk[USED_POS_MINUS] || m_smallStepAngle[USED_POS_PLUS] <= m_smallStepAngle[USED_POS_MINUS])) return NextSmallStepAngle(1.0, USED_POS_PLUS, angle); - } // -- direction less updated - else if( m_smallStepOk[USED_POS_MINUS] ) - { + else if (m_smallStepOk[USED_POS_MINUS]) return NextSmallStepAngle(-1.0, USED_POS_MINUS, angle); - } } // no angles diff --git a/src/server/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h index 571f4b5f556..efb655ca1f7 100755 --- a/src/server/game/Entities/Object/ObjectPosSelector.h +++ b/src/server/game/Entities/Object/ObjectPosSelector.h @@ -53,14 +53,14 @@ struct ObjectPosSelector bool NextAngle(float& angle); bool NextUsedAngle(float& angle); - bool NextPosibleAngle( float& angle ); + bool NextPosibleAngle(float& angle); bool CheckAngle(UsedPosList::value_type const& nextUsedPos, float sign, float angle ) const { float angle_step2 = GetAngle(nextUsedPos.second); float next_angle = nextUsedPos.first; - if(nextUsedPos.second.sign * sign < 0) // last node from diff. list (-pi+alpha) + if (nextUsedPos.second.sign * sign < 0) // last node from diff. list (-pi+alpha) next_angle = 2*M_PI-next_angle; // move to positive return fabs(angle)+angle_step2 <= next_angle; @@ -68,13 +68,13 @@ struct ObjectPosSelector bool CheckOriginal() const { - return (m_UsedPosLists[USED_POS_PLUS].empty() || CheckAngle( *m_UsedPosLists[USED_POS_PLUS].begin(), 1.0, 0)) && - (m_UsedPosLists[USED_POS_MINUS].empty() || CheckAngle( *m_UsedPosLists[USED_POS_MINUS].begin(), -1.0, 0)); + return (m_UsedPosLists[USED_POS_PLUS].empty() || CheckAngle(*m_UsedPosLists[USED_POS_PLUS].begin(), 1.0, 0)) && + (m_UsedPosLists[USED_POS_MINUS].empty() || CheckAngle(*m_UsedPosLists[USED_POS_MINUS].begin(), -1.0, 0)); } bool IsNonBalanced() const { return m_UsedPosLists[USED_POS_PLUS].empty() != m_UsedPosLists[USED_POS_MINUS].empty(); } - bool NextAngleFor( UsedPosList::value_type const& usedPos, float sign, UsedPosType uptype, float &angle ) + bool NextAngleFor(UsedPosList::value_type const& usedPos, float sign, UsedPosType uptype, float &angle) { float angle_step = GetAngle(usedPos.second); @@ -82,10 +82,10 @@ struct ObjectPosSelector angle = usedPos.first * usedPos.second.sign + angle_step * sign; UsedPosList::value_type const* nextNode = nextUsedPos(uptype); - if(nextNode) + if (nextNode) { // if next node permit use selected angle, then do it - if(!CheckAngle(*nextNode, sign, angle)) + if (!CheckAngle(*nextNode, sign, angle)) { m_smallStepOk[uptype] = false; return false; @@ -100,27 +100,27 @@ struct ObjectPosSelector return true; } - bool NextSmallStepAngle( float sign, UsedPosType uptype, float &angle ) + bool NextSmallStepAngle(float sign, UsedPosType uptype, float &angle) { // next possible angle angle = m_smallStepAngle[uptype] + m_anglestep * sign; - if(fabs(angle) > M_PI) + if (fabs(angle) > M_PI) { m_smallStepOk[uptype] = false; return false; } - if(m_smallStepNextUsedPos[uptype]) + if (m_smallStepNextUsedPos[uptype]) { - if(fabs(angle) >= m_smallStepNextUsedPos[uptype]->first) + if (fabs(angle) >= m_smallStepNextUsedPos[uptype]->first) { m_smallStepOk[uptype] = false; return false; } // if next node permit use selected angle, then do it - if(!CheckAngle(*m_smallStepNextUsedPos[uptype], sign, angle)) + if (!CheckAngle(*m_smallStepNextUsedPos[uptype], sign, angle)) { m_smallStepOk[uptype] = false; return false; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 727654f0698..b9e1e07f659 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -299,7 +299,7 @@ Item* TradeData::GetItem(TradeSlots slot) const bool TradeData::HasItem(uint64 item_guid) const { - for(uint8 i = 0; i < TRADE_SLOT_COUNT; ++i) + for (uint8 i = 0; i < TRADE_SLOT_COUNT; ++i) if (m_items[i] == item_guid) return true; @@ -7227,7 +7227,7 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, int32 honor, bool pvpt uint32 itemId = sWorld->getIntConfig(CONFIG_PVP_TOKEN_ID); int32 count = sWorld->getIntConfig(CONFIG_PVP_TOKEN_COUNT); - if(AddItem(itemId, count)) + if (AddItem(itemId, count)) ChatHandler(this).PSendSysMessage("You have been awarded a token for slaying another player."); } } @@ -7923,7 +7923,7 @@ void Player::_ApplyItemBonuses(ItemTemplate const *proto, uint8 slot, bool apply attType = OFF_ATTACK; } - if(CanUseAttackType(attType)) + if (CanUseAttackType(attType)) _ApplyWeaponDamage(slot, proto, ssv, apply); int32 extraDPS = ssv->getDPSMod(proto->ScalingStatValue); @@ -11185,10 +11185,10 @@ InventoryResult Player::CanStoreItems(Item** pItems, int count) const { bool b_found = false; - for (int t = KEYRING_SLOT_START; t < KEYRING_SLOT_END; ++t) + for (uint8 t = KEYRING_SLOT_START; t < KEYRING_SLOT_END; ++t) { - pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t ); - if( pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_keys[t-KEYRING_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize()) + pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, t); + if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_keys[t-KEYRING_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize()) { inv_keys[t-KEYRING_SLOT_START] += pItem->GetCount(); b_found = true; @@ -11200,7 +11200,7 @@ InventoryResult Player::CanStoreItems(Item** pItems, int count) const for (int t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t) { pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, t); - if( pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_tokens[t-CURRENCYTOKEN_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize()) + if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_tokens[t-CURRENCYTOKEN_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize()) { inv_tokens[t-CURRENCYTOKEN_SLOT_START] += pItem->GetCount(); b_found = true; @@ -11212,7 +11212,7 @@ InventoryResult Player::CanStoreItems(Item** pItems, int count) const for (int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t) { pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, t); - if( pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_slot_items[t-INVENTORY_SLOT_ITEM_START] + pItem->GetCount() <= pProto->GetMaxStackSize()) + if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_slot_items[t-INVENTORY_SLOT_ITEM_START] + pItem->GetCount() <= pProto->GetMaxStackSize()) { inv_slot_items[t-INVENTORY_SLOT_ITEM_START] += pItem->GetCount(); b_found = true; @@ -11230,7 +11230,7 @@ InventoryResult Player::CanStoreItems(Item** pItems, int count) const for (uint32 j = 0; j < bag->GetBagSize(); j++) { pItem2 = GetItemByPos(t, j); - if( pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_bags[t-INVENTORY_SLOT_BAG_START][j] + pItem->GetCount() <= pProto->GetMaxStackSize()) + if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_bags[t-INVENTORY_SLOT_BAG_START][j] + pItem->GetCount() <= pProto->GetMaxStackSize()) { inv_bags[t-INVENTORY_SLOT_BAG_START][j] += pItem->GetCount(); b_found = true; @@ -12357,7 +12357,7 @@ void Player::DestroyItem(uint8 bag, uint8 slot, bool update) { sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "STORAGE: DestroyItem bag = %u, slot = %u, item = %u", bag, slot, pItem->GetEntry()); // Also remove all contained items if the item is a bag. - // This if() prevents item saving crashes if the condition for a bag to be empty before being destroyed was bypassed somehow. + // This if () prevents item saving crashes if the condition for a bag to be empty before being destroyed was bypassed somehow. if (pItem->IsNotEmptyBag()) for (uint8 i = 0; i < MAX_BAG_SIZE; ++i) DestroyItem(slot, i, update); @@ -13517,7 +13517,7 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool // If we're dealing with a gem inside a prismatic socket we need to check the prismatic socket requirements // rather than the gem requirements itself. If the socket has no color it is a prismatic socket. - if((slot == SOCK_ENCHANTMENT_SLOT || slot == SOCK_ENCHANTMENT_SLOT_2 || slot == SOCK_ENCHANTMENT_SLOT_3) + if ((slot == SOCK_ENCHANTMENT_SLOT || slot == SOCK_ENCHANTMENT_SLOT_2 || slot == SOCK_ENCHANTMENT_SLOT_3) && !item->GetTemplate()->Socket[slot-SOCK_ENCHANTMENT_SLOT].Color) { // Check if the requirements for the prismatic socket are met before applying the gem stats @@ -24463,7 +24463,7 @@ bool Player::AddItem(uint32 itemId, uint32 count) } Item* item = StoreNewItem(dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId)); - if(item) + if (item) SendNewItem(item, count, true, false); else return false; diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 3d5be3af5a6..577bc63fbb8 100755 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -541,7 +541,7 @@ bool Transport::RemovePassenger(Player* passenger) void Transport::Update(uint32 p_diff) { - if(!AI()) + if (!AI()) { if (!AIM_Initialize()) sLog->outError("Could not initialize GameObjectAI for Transport"); @@ -669,7 +669,7 @@ uint32 Transport::AddNPCPassenger(uint32 tguid, uint32 entry, float x, float y, pCreature->SetHomePosition(pCreature->GetPositionX(), pCreature->GetPositionY(), pCreature->GetPositionZ(), pCreature->GetOrientation()); - if(!pCreature->IsPositionValid()) + if (!pCreature->IsPositionValid()) { sLog->outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)", pCreature->GetGUIDLow(), pCreature->GetEntry(), pCreature->GetPositionX(), pCreature->GetPositionY()); delete pCreature; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 08e831431f7..27b37dfff9f 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1948,12 +1948,12 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex GetGUIDLow(), pVictim->GetGUIDLow(), pVictim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist); } - if(!extra && m_extraAttacks) + if (!extra && m_extraAttacks) { while(m_extraAttacks) { AttackerStateUpdate(pVictim, BASE_ATTACK, true); - if(m_extraAttacks > 0) + if (m_extraAttacks > 0) --m_extraAttacks; } } @@ -6619,7 +6619,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger break; } // Glyph of Mend Pet - if(dummySpell->Id == 57870) + if (dummySpell->Id == 57870) { pVictim->CastSpell(pVictim, 57894, true, NULL, NULL, GetGUID()); return true; @@ -7208,7 +7208,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger case 70808: { // Chain Heal - if((procSpell->SpellFamilyFlags[0] & 0x100) && (procEx & PROC_EX_CRITICAL_HIT)) + if ((procSpell->SpellFamilyFlags[0] & 0x100) && (procEx & PROC_EX_CRITICAL_HIT)) { triggered_spell_id = 70809; SpellEntry const* triggeredSpell = sSpellStore.LookupEntry(triggered_spell_id); @@ -7222,7 +7222,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger case 70811: { // Lightning Bolt & Chain Lightning - if(procSpell->SpellFamilyFlags[0] & 0x3) + if (procSpell->SpellFamilyFlags[0] & 0x3) { if (ToPlayer()->HasSpellCooldown(16166)) { @@ -8417,14 +8417,14 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig //Item - Coliseum 25 Normal Caster Trinket case 67712: { - if(!pVictim || !pVictim->isAlive()) + if (!pVictim || !pVictim->isAlive()) return false; // stacking CastSpell(this, 67713, true, NULL, triggeredByAura); Aura * dummy = GetAura(67713); // release at 3 aura in stack (cont contain in basepoint of trigger aura) - if(!dummy || dummy->GetStackAmount() < triggerAmount) + if (!dummy || dummy->GetStackAmount() < triggerAmount) return false; RemoveAurasDueToSpell(67713); @@ -8435,14 +8435,14 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig //Item - Coliseum 25 Heroic Caster Trinket case 67758: { - if(!pVictim || !pVictim->isAlive()) + if (!pVictim || !pVictim->isAlive()) return false; // stacking CastSpell(this, 67759, true, NULL, triggeredByAura); Aura * dummy = GetAura(67759); // release at 3 aura in stack (cont contain in basepoint of trigger aura) - if(!dummy || dummy->GetStackAmount() < triggerAmount) + if (!dummy || dummy->GetStackAmount() < triggerAmount) return false; RemoveAurasDueToSpell(67759); @@ -10560,7 +10560,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 break; case SPELLFAMILY_HUNTER: // Steady Shot - if(spellProto->SpellFamilyFlags[1] & 0x1) + if (spellProto->SpellFamilyFlags[1] & 0x1) if (AuraEffect * aurEff = GetAuraEffect(56826, 0)) // Glyph of Steady Shot if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_HUNTER, 0x00004000, 0, 0, GetGUID())) AddPctN(DoneTotalMod, aurEff->GetAmount()); @@ -12895,7 +12895,7 @@ Unit* Creature::SelectVictim() } Unit::AuraEffectList const& iAuras = GetAuraEffectsByType(SPELL_AURA_MOD_INVISIBILITY); - if(!iAuras.empty()) + if (!iAuras.empty()) { for (Unit::AuraEffectList::const_iterator itr = iAuras.begin(); itr != iAuras.end(); ++itr) { @@ -14195,7 +14195,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, if (isVictim) procExtra &= ~PROC_EX_INTERNAL_REQ_FAMILY; SpellEntry const* spellProto = itr->second->GetBase()->GetSpellProto(); - if(!IsTriggeredAtSpellProcEvent(pTarget, triggerData.aura, procSpell, procFlag, procExtra, attType, isVictim, active, triggerData.spellProcEvent)) + if (!IsTriggeredAtSpellProcEvent(pTarget, triggerData.aura, procSpell, procFlag, procExtra, attType, isVictim, active, triggerData.spellProcEvent)) continue; // Triggered spells not triggering additional spells @@ -16750,7 +16750,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId) uint64 origCasterGUID = (itr->second.castFlags & NPC_CLICK_CAST_ORIG_CASTER_OWNER) ? GetOwnerGUID() : clicker->GetGUID(); SpellEntry const* spellEntry = sSpellStore.LookupEntry(itr->second.spellId); - // if(!spellEntry) should be checked at npc_spellclick load + // if (!spellEntry) should be checked at npc_spellclick load if (seatId > -1) { diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 2dfaf4a63cd..a1a4035ca4d 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -500,7 +500,7 @@ void Vehicle::InitMovementInfoForBase() if (vehicleFlags & VEHICLE_FLAG_FULLSPEEDTURNING) me->AddExtraUnitMovementFlag(MOVEMENTFLAG2_FULL_SPEED_TURNING); if (vehicleFlags & VEHICLE_FLAG_ALLOW_PITCHING) - me->AddExtraUnitMovementFlag( MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING); + me->AddExtraUnitMovementFlag(MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING); if (vehicleFlags & VEHICLE_FLAG_FULLSPEEDPITCHING) me->AddExtraUnitMovementFlag(MOVEMENTFLAG2_FULL_SPEED_PITCHING); } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 25d8b1a8800..ef161da9783 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -4920,9 +4920,9 @@ void ObjectMgr::LoadEventScripts() } } - for(size_t path_idx = 0; path_idx < sTaxiPathNodesByPath.size(); ++path_idx) + for (size_t path_idx = 0; path_idx < sTaxiPathNodesByPath.size(); ++path_idx) { - for(size_t node_idx = 0; node_idx < sTaxiPathNodesByPath[path_idx].size(); ++node_idx) + for (size_t node_idx = 0; node_idx < sTaxiPathNodesByPath[path_idx].size(); ++node_idx) { TaxiPathNodeEntry const& node = sTaxiPathNodesByPath[path_idx][node_idx]; @@ -7199,7 +7199,7 @@ void ObjectMgr::LoadQuestPOI() int32 x = fields[2].GetInt32(); int32 y = fields[3].GetInt32(); - if(POIs[questId].size() <= id + 1) + if (POIs[questId].size() <= id + 1) POIs[questId].resize(id + 10); QuestPOIPoint point(x, y); @@ -8255,7 +8255,7 @@ void ObjectMgr::LoadMailLevelRewards() sLog->outString(); } -void ObjectMgr::AddSpellToTrainer( uint32 entry, uint32 spell, uint32 spellCost, uint32 reqSkill, uint32 reqSkillValue, uint32 reqLevel) +void ObjectMgr::AddSpellToTrainer(uint32 entry, uint32 spell, uint32 spellCost, uint32 reqSkill, uint32 reqSkillValue, uint32 reqLevel) { if (entry >= TRINITY_TRAINER_START_REF) return; @@ -8614,7 +8614,7 @@ bool ObjectMgr::RemoveVendorItem(uint32 entry, uint32 item, bool savetodb) if (iter == m_mCacheVendorItemMap.end()) return false; - if(!iter->second.RemoveItem(item)) + if (!iter->second.RemoveItem(item)) return false; if (savetodb) WorldDatabase.PExecute("DELETE FROM npc_vendor WHERE entry='%u' AND item='%u'", entry, item); @@ -8692,7 +8692,7 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max if (pl) ChatHandler(pl).PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST, item_id, ExtendedCost); else - sLog->outErrorDb( "Table `npc_vendor` has duplicate items %u (with extended cost %u) for vendor (Entry: %u), ignoring", item_id, ExtendedCost, vendor_entry); + sLog->outErrorDb("Table `npc_vendor` has duplicate items %u (with extended cost %u) for vendor (Entry: %u), ignoring", item_id, ExtendedCost, vendor_entry); return false; } diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index bb4e539c63e..c7f51c5b784 100755 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -648,7 +648,7 @@ class ObjectMgr ItemSetNameEntry const* GetItemSetNameEntry(uint32 itemId) { ItemSetNameMap::iterator itr = mItemSetNameMap.find(itemId); - if(itr != mItemSetNameMap.end()) + if (itr != mItemSetNameMap.end()) return &itr->second; return NULL; } diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h index a940d4daf64..a6e1316718e 100755 --- a/src/server/game/Grids/Grid.h +++ b/src/server/game/Grids/Grid.h @@ -58,7 +58,7 @@ class Grid */ template<class SPECIFIC_OBJECT> void AddWorldObject(SPECIFIC_OBJECT *obj) { - if(!i_objects.template insert<SPECIFIC_OBJECT>(obj)) + if (!i_objects.template insert<SPECIFIC_OBJECT>(obj)) ASSERT(false); } @@ -66,7 +66,7 @@ class Grid */ template<class SPECIFIC_OBJECT> void RemoveWorldObject(SPECIFIC_OBJECT *obj) { - if(!i_objects.template remove<SPECIFIC_OBJECT>(obj)) + if (!i_objects.template remove<SPECIFIC_OBJECT>(obj)) ASSERT(false); } @@ -104,7 +104,7 @@ class Grid */ template<class SPECIFIC_OBJECT> void AddGridObject(SPECIFIC_OBJECT *obj) { - if(!i_container.template insert<SPECIFIC_OBJECT>(obj)) + if (!i_container.template insert<SPECIFIC_OBJECT>(obj)) ASSERT(false); } @@ -112,7 +112,7 @@ class Grid */ template<class SPECIFIC_OBJECT> void RemoveGridObject(SPECIFIC_OBJECT *obj) { - if(!i_container.template remove<SPECIFIC_OBJECT>(obj)) + if (!i_container.template remove<SPECIFIC_OBJECT>(obj)) ASSERT(false); } diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h index 1a109edef05..e3c4a6b0f54 100755 --- a/src/server/game/Grids/GridReference.h +++ b/src/server/game/Grids/GridReference.h @@ -37,7 +37,7 @@ class GridReference : public Reference<GridRefManager<OBJECT>, OBJECT> void targetObjectDestroyLink() { // called from unlink() - if(this->isValid()) this->getTarget()->decSize(); + if (this->isValid()) this->getTarget()->decSize(); } void sourceObjectDestroyLink() { diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h index 95aa6901871..946afef6dfc 100755 --- a/src/server/game/Grids/NGrid.h +++ b/src/server/game/Grids/NGrid.h @@ -40,10 +40,10 @@ public: i_unloadActiveLockCount(0), i_unloadExplicitLock(!unload), i_unloadReferenceLock(false) {} const TimeTracker& getTimeTracker() const { return i_timer; } bool getUnloadLock() const { return i_unloadActiveLockCount || i_unloadExplicitLock || i_unloadReferenceLock; } - void setUnloadExplicitLock( bool on ) { i_unloadExplicitLock = on; } - void setUnloadReferenceLock( bool on ) { i_unloadReferenceLock = on; } + void setUnloadExplicitLock(bool on) { i_unloadExplicitLock = on; } + void setUnloadReferenceLock(bool on) { i_unloadReferenceLock = on; } void incUnloadActiveLock() { ++i_unloadActiveLockCount; } - void decUnloadActiveLock() { if(i_unloadActiveLockCount) --i_unloadActiveLockCount; } + void decUnloadActiveLock() { if (i_unloadActiveLockCount) --i_unloadActiveLockCount; } void setTimer(const TimeTracker& pTimer) { i_timer = pTimer; } void ResetTimeTracker(time_t interval) { i_timer.Reset(interval); } @@ -116,8 +116,8 @@ class NGrid GridInfo* getGridInfoRef() { return &i_GridInfo; } const TimeTracker& getTimeTracker() const { return i_GridInfo.getTimeTracker(); } bool getUnloadLock() const { return i_GridInfo.getUnloadLock(); } - void setUnloadExplicitLock( bool on ) { i_GridInfo.setUnloadExplicitLock(on); } - void setUnloadReferenceLock( bool on ) { i_GridInfo.setUnloadReferenceLock(on); } + void setUnloadExplicitLock(bool on) { i_GridInfo.setUnloadExplicitLock(on); } + void setUnloadReferenceLock(bool on) { i_GridInfo.setUnloadReferenceLock(on); } void incUnloadActiveLock() { i_GridInfo.incUnloadActiveLock(); } void decUnloadActiveLock() { i_GridInfo.decUnloadActiveLock(); } void ResetTimeTracker(time_t interval) { i_GridInfo.ResetTimeTracker(interval); } diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index bc69c1c64d3..a5c41b3049d 100755 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -1443,7 +1443,7 @@ void LoadLootTemplates_Creature() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Creature.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u creature loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 creature loot templates. DB table `creature_loot_template` is empty"); @@ -1478,7 +1478,7 @@ void LoadLootTemplates_Disenchant() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Disenchant.ReportUnusedIds(lootIdSet); - if(count) + if (count) sLog->outString(">> Loaded %u disenchanting loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 disenchanting loot templates. DB table `disenchant_loot_template` is empty"); @@ -1503,7 +1503,7 @@ void LoadLootTemplates_Fishing() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Fishing.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u fishing loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 fishing loot templates. DB table `fishing_loot_template` is empty"); @@ -1539,7 +1539,7 @@ void LoadLootTemplates_Gameobject() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Gameobject.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u gameobject loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 gameobject loot templates. DB table `gameobject_loot_template` is empty"); @@ -1565,7 +1565,7 @@ void LoadLootTemplates_Item() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Item.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u prospecting loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 prospecting loot templates. DB table `item_loot_template` is empty"); @@ -1596,7 +1596,7 @@ void LoadLootTemplates_Milling() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Milling.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u milling loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 milling loot templates. DB table `milling_loot_template` is empty"); @@ -1632,7 +1632,7 @@ void LoadLootTemplates_Pickpocketing() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Pickpocketing.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u pickpocketing loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 pickpocketing loot templates. DB table `pickpocketing_loot_template` is empty"); @@ -1663,7 +1663,7 @@ void LoadLootTemplates_Prospecting() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Prospecting.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u prospecting loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 prospecting loot templates. DB table `prospecting_loot_template` is empty"); @@ -1689,7 +1689,7 @@ void LoadLootTemplates_Mail() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Mail.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u mail loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 mail loot templates. DB table `mail_loot_template` is empty"); @@ -1725,7 +1725,7 @@ void LoadLootTemplates_Skinning() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Skinning.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u skinning loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 skinning loot templates. DB table `skinning_loot_template` is empty"); @@ -1769,7 +1769,7 @@ void LoadLootTemplates_Spell() // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Spell.ReportUnusedIds(ids_set); - if(count) + if (count) sLog->outString(">> Loaded %u spell loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); else sLog->outErrorDb(">> Loaded 0 spell loot templates. DB table `spell_loot_template` is empty"); diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 6205b2037a3..cfd5dafbfb8 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -505,10 +505,10 @@ void Map::VisitNearbyCellsOf(WorldObject* obj, TypeContainerVisitor<Trinity::Obj void Map::Update(const uint32 &t_diff) { /// update worldsessions for existing players - for(m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) + for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) { Player* plr = m_mapRefIter->getSource(); - if(plr && plr->IsInWorld()) + if (plr && plr->IsInWorld()) { //plr->Update(t_diff); WorldSession * pSession = plr->GetSession(); @@ -1605,21 +1605,21 @@ inline bool IsOutdoorWMO(uint32 mogpFlags, int32 /*adtId*/, int32 /*rootId*/, in { bool outdoor = true; - if(wmoEntry && atEntry) + if (wmoEntry && atEntry) { - if(atEntry->flags & AREA_FLAG_OUTSIDE) + if (atEntry->flags & AREA_FLAG_OUTSIDE) return true; - if(atEntry->flags & AREA_FLAG_INSIDE) + if (atEntry->flags & AREA_FLAG_INSIDE) return false; } outdoor = mogpFlags&0x8; - if(wmoEntry) + if (wmoEntry) { - if(wmoEntry->Flags & 4) + if (wmoEntry->Flags & 4) return true; - if((wmoEntry->Flags & 2)!=0) + if ((wmoEntry->Flags & 2)!=0) outdoor = false; } return outdoor; @@ -1631,12 +1631,12 @@ bool Map::IsOutdoors(float x, float y, float z) const int32 adtId, rootId, groupId; // no wmo found? -> outside by default - if(!GetAreaInfo(x, y, z, mogpFlags, adtId, rootId, groupId)) + if (!GetAreaInfo(x, y, z, mogpFlags, adtId, rootId, groupId)) return true; AreaTableEntry const* atEntry = 0; WMOAreaTableEntry const* wmoEntry= GetWMOAreaTableEntryByTripple(rootId, adtId, groupId); - if(wmoEntry) + if (wmoEntry) { sLog->outStaticDebug("Got WMOAreaTableEntry! flag %u, areaid %u", wmoEntry->Flags, wmoEntry->areaId); atEntry = GetAreaEntryByAreaID(wmoEntry->areaId); @@ -1651,11 +1651,11 @@ bool Map::GetAreaInfo(float x, float y, float z, uint32 &flags, int32 &adtId, in if (vmgr->getAreaInfo(GetId(), x, y, vmap_z, flags, adtId, rootId, groupId)) { // check if there's terrain between player height and object height - if(GridMap *gmap = const_cast<Map*>(this)->GetGrid(x, y)) + if (GridMap *gmap = const_cast<Map*>(this)->GetGrid(x, y)) { float _mapheight = gmap->getHeight(x, y); // z + 2.0f condition taken from GetHeight(), not sure if it's such a great choice... - if(z + 2.0f > _mapheight && _mapheight > vmap_z) + if (z + 2.0f > _mapheight && _mapheight > vmap_z) return false; } return true; @@ -1744,7 +1744,7 @@ ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidTyp } } - if(GridMap* gmap = const_cast<Map*>(this)->GetGrid(x, y)) + if (GridMap* gmap = const_cast<Map*>(this)->GetGrid(x, y)) { LiquidData map_data; ZLiquidStatus map_result = gmap->getLiquidStatus(x, y, z, ReqLiquidType, &map_data); diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index c09c09632fa..09fa4daa5e9 100755 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -513,7 +513,7 @@ void Map::ScriptsProcess() break; case SCRIPT_COMMAND_TELEPORT_TO: - if (step.script->TeleportTo.Flags & SF_TELEPORT_USE_CREATURE) + if (step.script->TeleportTo.Flags & SF_TELEPORT_USE_CREATURE) { // Source or target must be Creature. if (Creature *cSource = _GetScriptCreatureSourceOrTarget(source, target, step.script, true)) diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp index 784126d96ce..a506218aeb2 100755 --- a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp @@ -64,7 +64,7 @@ bool AddonHandler::BuildAddonPacket(WorldPacket *Source, WorldPacket *Target) *Source >> TempValue; // get real size of the packed structure // empty addon packet, nothing process, can't be received from real client - if(!TempValue) + if (!TempValue) return false; AddonRealSize = TempValue; // temp value because ZLIB only excepts uLongf @@ -80,20 +80,20 @@ bool AddonHandler::BuildAddonPacket(WorldPacket *Source, WorldPacket *Target) uint32 addonsCount; AddOnPacked >> addonsCount; // addons count? - for(uint32 i = 0; i < addonsCount; ++i) + for (uint32 i = 0; i < addonsCount; ++i) { std::string addonName; uint8 enabled; uint32 crc, unk2; // check next addon data format correctness - if(AddOnPacked.rpos()+1 > AddOnPacked.size()) + if (AddOnPacked.rpos()+1 > AddOnPacked.size()) return false; AddOnPacked >> addonName; // recheck next addon data format correctness - if(AddOnPacked.rpos()+1+4+4 > AddOnPacked.size()) + if (AddOnPacked.rpos()+1+4+4 > AddOnPacked.size()) return false; AddOnPacked >> enabled >> crc >> unk2; @@ -130,7 +130,7 @@ bool AddonHandler::BuildAddonPacket(WorldPacket *Source, WorldPacket *Target) uint32 count = 0; *Target << uint32(count); - if(AddOnPacked.rpos() != AddOnPacked.size()) + if (AddOnPacked.rpos() != AddOnPacked.size()) sLog->outDebug(LOG_FILTER_NETWORKIO, "packet under read!"); } else diff --git a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp index 428db45a7cc..6b7ceb8515d 100755 --- a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp @@ -152,7 +152,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data) if (item) { ItemTemplate const* itemProto = item->GetTemplate(); - if(!itemProto || !(itemProto->Flags & ITEM_PROTO_FLAG_BIND_TO_ACCOUNT)) + if (!itemProto || !(itemProto->Flags & ITEM_PROTO_FLAG_BIND_TO_ACCOUNT)) { accountBound = false; break; diff --git a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp index fca554bc3be..e2f7f19ce79 100755 --- a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp @@ -222,7 +222,7 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) } // Verify that the bag is an actual bag or wrapped item that can be used "normally" - if(!(proto->Flags & ITEM_PROTO_FLAG_OPENABLE) && !pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_WRAPPED)) + if (!(proto->Flags & ITEM_PROTO_FLAG_OPENABLE) && !pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_WRAPPED)) { pUser->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL); sLog->outError("Possible hacking attempt: Player %s [guid: %u] tried to open item [guid: %u, entry: %u] which is not openable!", diff --git a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp index 17b63f80d89..9200f145d36 100755 --- a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp @@ -219,7 +219,7 @@ static void setAcceptTradeMode(TradeData* myTrade, TradeData* hisTrade, Item **m hisTrade->SetInAcceptProcess(true); // store items in local list and set 'in-trade' flag - for(uint8 i = 0; i < TRADE_SLOT_TRADED_COUNT; ++i) + for (uint8 i = 0; i < TRADE_SLOT_TRADED_COUNT; ++i) { if (Item* item = myTrade->GetItem(TradeSlots(i))) { diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index d19ee3d7d3a..2ca01452799 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -495,13 +495,13 @@ int32 AuraEffect::CalculateAmount(Unit* caster) DoneActualBenefit = caster->ApplyEffectModifiers(GetSpellProto(), m_effIndex, DoneActualBenefit); } // Fire Ward - else if(GetSpellProto()->SpellFamilyFlags[0] & 0x8 && GetSpellProto()->SpellFamilyFlags[2] & 0x8) + else if (GetSpellProto()->SpellFamilyFlags[0] & 0x8 && GetSpellProto()->SpellFamilyFlags[2] & 0x8) { // +80.68% from sp bonus DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f; } // Frost Ward - else if(GetSpellProto()->SpellFamilyFlags[0] & 0x100 && GetSpellProto()->SpellFamilyFlags[2] & 0x8) + else if (GetSpellProto()->SpellFamilyFlags[0] & 0x100 && GetSpellProto()->SpellFamilyFlags[2] & 0x8) { // +80.68% from sp bonus DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f; @@ -2896,7 +2896,7 @@ void AuraEffect::HandleModStealth(AuraApplication const* aurApp, uint8 mode, boo if (apply) { - target->m_stealth.AddFlag( type); + target->m_stealth.AddFlag(type); target->m_stealth.AddValue(type, GetAmount()); target->SetStandFlags(UNIT_STAND_FLAGS_CREEP); @@ -3283,7 +3283,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo // Disarm handling // If druid shifts while being disarmed we need to deal with that since forms aren't affected by disarm // and also HandleAuraModDisarm is not triggered - if(!target->CanUseAttackType(BASE_ATTACK)) + if (!target->CanUseAttackType(BASE_ATTACK)) { if (Item *pItem = target->ToPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND)) { @@ -6626,7 +6626,7 @@ void AuraEffect::HandleAuraModFakeInebriation(AuraApplication const* aurApp, uin if (apply) { - target->m_invisibilityDetect.AddFlag( INVISIBILITY_DRUNK); + target->m_invisibilityDetect.AddFlag(INVISIBILITY_DRUNK); target->m_invisibilityDetect.AddValue(INVISIBILITY_DRUNK, GetAmount()); if (target->GetTypeId() == TYPEID_PLAYER) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 9b1eb9aba89..b91f16af467 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -807,7 +807,7 @@ bool Aura::ModStackAmount(int32 num, AuraRemoveMode removeMode) if ((num > 0) && (stackAmount > int32(m_spellProto->StackAmount))) { // not stackable aura - set stack amount to 1 - if(!m_spellProto->StackAmount) + if (!m_spellProto->StackAmount) stackAmount = 1; else stackAmount = m_spellProto->StackAmount; @@ -1713,7 +1713,7 @@ void Aura::LoadScripts() { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura::LoadScripts"); sScriptMgr->CreateAuraScripts(m_spellProto->Id, m_loadedScripts); - for(std::list<AuraScript *>::iterator itr = m_loadedScripts.begin(); itr != m_loadedScripts.end() ;) + for (std::list<AuraScript *>::iterator itr = m_loadedScripts.begin(); itr != m_loadedScripts.end() ;) { if (!(*itr)->_Load(this)) { @@ -1729,12 +1729,12 @@ void Aura::LoadScripts() bool Aura::CallScriptCheckAreaTargetHandlers(Unit* target) { - for(std::list<AuraScript*>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript*>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_CHECK_AREA_TARGET); std::list<AuraScript::CheckAreaTargetHandler>::iterator hookItrEnd = (*scritr)->DoCheckAreaTarget.end(), hookItr = (*scritr)->DoCheckAreaTarget.begin(); for (; hookItr != hookItrEnd ; ++hookItr) - if(!(*hookItr).Call(*scritr, target)) + if (!(*hookItr).Call(*scritr, target)) return false; (*scritr)->_FinishScriptCall(); } @@ -1744,11 +1744,11 @@ bool Aura::CallScriptCheckAreaTargetHandlers(Unit* target) bool Aura::CallScriptEffectApplyHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode) { bool preventDefault = false; - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_APPLY, aurApp); std::list<AuraScript::EffectApplyHandler>::iterator effEndItr = (*scritr)->OnEffectApply.end(), effItr = (*scritr)->OnEffectApply.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, mode); @@ -1763,11 +1763,11 @@ bool Aura::CallScriptEffectApplyHandlers(AuraEffect const* aurEff, AuraApplicati bool Aura::CallScriptEffectRemoveHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode) { bool preventDefault = false; - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_REMOVE, aurApp); std::list<AuraScript::EffectApplyHandler>::iterator effEndItr = (*scritr)->OnEffectRemove.end(), effItr = (*scritr)->OnEffectRemove.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, mode); @@ -1781,11 +1781,11 @@ bool Aura::CallScriptEffectRemoveHandlers(AuraEffect const* aurEff, AuraApplicat void Aura::CallScriptAfterEffectApplyHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_AFTER_APPLY, aurApp); std::list<AuraScript::EffectApplyHandler>::iterator effEndItr = (*scritr)->AfterEffectApply.end(), effItr = (*scritr)->AfterEffectApply.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, mode); @@ -1796,11 +1796,11 @@ void Aura::CallScriptAfterEffectApplyHandlers(AuraEffect const* aurEff, AuraAppl void Aura::CallScriptAfterEffectRemoveHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_AFTER_REMOVE, aurApp); std::list<AuraScript::EffectApplyHandler>::iterator effEndItr = (*scritr)->AfterEffectRemove.end(), effItr = (*scritr)->AfterEffectRemove.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, mode); @@ -1812,11 +1812,11 @@ void Aura::CallScriptAfterEffectRemoveHandlers(AuraEffect const* aurEff, AuraApp bool Aura::CallScriptEffectPeriodicHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp) { bool preventDefault = false; - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_PERIODIC, aurApp); std::list<AuraScript::EffectPeriodicHandler>::iterator effEndItr = (*scritr)->OnEffectPeriodic.end(), effItr = (*scritr)->OnEffectPeriodic.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff); @@ -1830,11 +1830,11 @@ bool Aura::CallScriptEffectPeriodicHandlers(AuraEffect const* aurEff, AuraApplic void Aura::CallScriptEffectUpdatePeriodicHandlers(AuraEffect * aurEff) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_UPDATE_PERIODIC); std::list<AuraScript::EffectUpdatePeriodicHandler>::iterator effEndItr = (*scritr)->OnEffectUpdatePeriodic.end(), effItr = (*scritr)->OnEffectUpdatePeriodic.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff); @@ -1845,11 +1845,11 @@ void Aura::CallScriptEffectUpdatePeriodicHandlers(AuraEffect * aurEff) void Aura::CallScriptEffectCalcAmountHandlers(AuraEffect const* aurEff, int32 & amount, bool & canBeRecalculated) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_CALC_AMOUNT); std::list<AuraScript::EffectCalcAmountHandler>::iterator effEndItr = (*scritr)->DoEffectCalcAmount.end(), effItr = (*scritr)->DoEffectCalcAmount.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, amount, canBeRecalculated); @@ -1860,11 +1860,11 @@ void Aura::CallScriptEffectCalcAmountHandlers(AuraEffect const* aurEff, int32 & void Aura::CallScriptEffectCalcPeriodicHandlers(AuraEffect const* aurEff, bool & isPeriodic, int32 & amplitude) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_CALC_PERIODIC); std::list<AuraScript::EffectCalcPeriodicHandler>::iterator effEndItr = (*scritr)->DoEffectCalcPeriodic.end(), effItr = (*scritr)->DoEffectCalcPeriodic.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, isPeriodic, amplitude); @@ -1875,11 +1875,11 @@ void Aura::CallScriptEffectCalcPeriodicHandlers(AuraEffect const* aurEff, bool & void Aura::CallScriptEffectCalcSpellModHandlers(AuraEffect const* aurEff, SpellModifier *& spellMod) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_CALC_SPELLMOD); std::list<AuraScript::EffectCalcSpellModHandler>::iterator effEndItr = (*scritr)->DoEffectCalcSpellMod.end(), effItr = (*scritr)->DoEffectCalcSpellMod.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, spellMod); @@ -1890,11 +1890,11 @@ void Aura::CallScriptEffectCalcSpellModHandlers(AuraEffect const* aurEff, SpellM void Aura::CallScriptEffectAbsorbHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & /*defaultPrevented*/) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_ABSORB, aurApp); std::list<AuraScript::EffectAbsorbHandler>::iterator effEndItr = (*scritr)->OnEffectAbsorb.end(), effItr = (*scritr)->OnEffectAbsorb.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, dmgInfo, absorbAmount); @@ -1905,11 +1905,11 @@ void Aura::CallScriptEffectAbsorbHandlers(AuraEffect * aurEff, AuraApplication c void Aura::CallScriptEffectAfterAbsorbHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_AFTER_ABSORB, aurApp); std::list<AuraScript::EffectAbsorbHandler>::iterator effEndItr = (*scritr)->AfterEffectAbsorb.end(), effItr = (*scritr)->AfterEffectAbsorb.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, dmgInfo, absorbAmount); @@ -1920,11 +1920,11 @@ void Aura::CallScriptEffectAfterAbsorbHandlers(AuraEffect * aurEff, AuraApplicat void Aura::CallScriptEffectManaShieldHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & /*defaultPrevented*/) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_MANASHIELD, aurApp); std::list<AuraScript::EffectManaShieldHandler>::iterator effEndItr = (*scritr)->OnEffectManaShield.end(), effItr = (*scritr)->OnEffectManaShield.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, dmgInfo, absorbAmount); @@ -1935,11 +1935,11 @@ void Aura::CallScriptEffectManaShieldHandlers(AuraEffect * aurEff, AuraApplicati void Aura::CallScriptEffectAfterManaShieldHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount) { - for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) + for (std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_AFTER_MANASHIELD, aurApp); std::list<AuraScript::EffectManaShieldHandler>::iterator effEndItr = (*scritr)->AfterEffectManaShield.end(), effItr = (*scritr)->AfterEffectManaShield.begin(); - for(; effItr != effEndItr ; ++effItr) + for (; effItr != effEndItr ; ++effItr) { if ((*effItr).IsEffectAffected(m_spellProto, aurEff->GetEffIndex())) (*effItr).Call(*scritr, aurEff, dmgInfo, absorbAmount); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 8f537b1111d..7ee06f604a9 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -297,10 +297,10 @@ void SpellCastTargets::read (ByteBuffer & data, Unit* caster) if (m_targetMask & (TARGET_FLAG_OBJECT)) data.readPackGUID(m_GOTargetGUID); - if(m_targetMask & (TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM)) + if (m_targetMask & (TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM)) data.readPackGUID(m_itemTargetGUID); - if(m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE)) + if (m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE)) data.readPackGUID(m_CorpseTargetGUID); if (m_targetMask & TARGET_FLAG_SOURCE_LOCATION) @@ -337,7 +337,7 @@ void SpellCastTargets::read (ByteBuffer & data, Unit* caster) m_dstPos.Relocate(caster); } - if(m_targetMask & TARGET_FLAG_STRING) + if (m_targetMask & TARGET_FLAG_STRING) data >> m_strTarget; Update(caster); @@ -358,20 +358,20 @@ void SpellCastTargets::write (ByteBuffer & data) } else if (m_targetMask & TARGET_FLAG_OBJECT) { - if(m_GOTarget) + if (m_GOTarget) data.append(m_GOTarget->GetPackGUID()); else data << uint8(0); } - else if (m_targetMask & ( TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE)) + else if (m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE)) data.appendPackGUID(m_CorpseTargetGUID); else data << uint8(0); } - if (m_targetMask & ( TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM)) + if (m_targetMask & (TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM)) { - if(m_itemTarget) + if (m_itemTarget) data.append(m_itemTarget->GetPackGUID()); else data << uint8(0); @@ -1074,7 +1074,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) { uint8 farMask = 0; // create far target mask - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (IsFarUnitTargetEffect(m_spellInfo->Effect[i])) if ((1 << i) & mask) farMask |= (1 << i); @@ -1088,7 +1088,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) // do far effects on the unit // can't use default call because of threading, do stuff as fast as possible - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (farMask & (1 << i)) HandleEffects(unit, NULL, NULL, i); return; @@ -4619,13 +4619,13 @@ SpellCastResult Spell::CheckCast(bool strict) if (bg->GetStatus() == STATUS_WAIT_LEAVE) return SPELL_FAILED_DONT_REPORT; - if(m_caster->GetTypeId() == TYPEID_PLAYER && VMAP::VMapFactory::createOrGetVMapManager()->isLineOfSightCalcEnabled()) + if (m_caster->GetTypeId() == TYPEID_PLAYER && VMAP::VMapFactory::createOrGetVMapManager()->isLineOfSightCalcEnabled()) { - if(m_spellInfo->Attributes & SPELL_ATTR0_OUTDOORS_ONLY && + if (m_spellInfo->Attributes & SPELL_ATTR0_OUTDOORS_ONLY && !m_caster->GetMap()->IsOutdoors(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ())) return SPELL_FAILED_ONLY_OUTDOORS; - if(m_spellInfo->Attributes & SPELL_ATTR0_INDOORS_ONLY && + if (m_spellInfo->Attributes & SPELL_ATTR0_INDOORS_ONLY && m_caster->GetMap()->IsOutdoors(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ())) return SPELL_FAILED_ONLY_INDOORS; } diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index fdb6e878092..28a92373097 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -446,7 +446,7 @@ void Spell::SpellDamageSchoolDmg(SpellEffIndex effIndex) case 52942: { // don't damage self and only players - if(unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER) + if (unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER) return; float radius = GetSpellRadiusForHostile(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[0])); @@ -1385,7 +1385,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) Unit::AttackerSet attackers = unitTarget->getAttackers(); // remove invalid attackers - for (Unit::AttackerSet::iterator aItr = attackers.begin(); aItr != attackers.end(); ) + for (Unit::AttackerSet::iterator aItr = attackers.begin(); aItr != attackers.end();) if (!(*aItr)->canAttack(m_caster)) attackers.erase(aItr++); else @@ -5808,7 +5808,7 @@ void Spell::EffectResurrect(SpellEffIndex effIndex) return; } break; - // Defibrillate ( Gnomish Army Knife) have 67% chance on success_list + // Defibrillate (Gnomish Army Knife) have 67% chance on success_list case 54732: if (roll_chance_i(33)) { @@ -6324,7 +6324,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) if (goinfo->type == GAMEOBJECT_TYPE_FISHINGNODE || goinfo->type == GAMEOBJECT_TYPE_FISHINGHOLE) { LiquidData liqData; - if ( !cMap->IsInWater(fx, fy, fz + 1.f/* -0.5f */, &liqData)) // Hack to prevent fishing bobber from failing to land on fishing hole + if (!cMap->IsInWater(fx, fy, fz + 1.f/* -0.5f */, &liqData)) // Hack to prevent fishing bobber from failing to land on fishing hole { // but this is not proper, we really need to ignore not materialized objects SendCastResult(SPELL_FAILED_NOT_HERE); SendChannelUpdate(0); @@ -7113,5 +7113,5 @@ void Spell::EffectBind(SpellEffIndex effIndex) data.Initialize(SMSG_PLAYERBOUND, 8+4); data << uint64(player->GetGUID()); data << uint32(area_id); - player->SendDirectMessage( &data ); + player->SendDirectMessage(&data); } diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index a267f6bdd72..6023bd81ed4 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1848,7 +1848,7 @@ int32 SpellMgr::CalculateSpellEffectAmount(SpellEntry const* spellEntry, uint8 e if (caster) { // bonus amount from combo points - if (caster->m_movedPlayer) + if (caster->m_movedPlayer) if (uint8 comboPoints = caster->m_movedPlayer->GetComboPoints()) if (float comboDamage = spellEntry->EffectPointsPerComboPoint[effIndex]) value += comboDamage * comboPoints; @@ -2797,7 +2797,7 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto return DIMINISHING_NONE; case SPELLFAMILY_GENERIC: // some generic arena related spells have by some strange reason MECHANIC_TURN - if (spellproto->Mechanic == MECHANIC_TURN) + if (spellproto->Mechanic == MECHANIC_TURN) return DIMINISHING_NONE; switch (spellproto->Id) { diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index f38133ebad2..59be9c71963 100755 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -64,7 +64,7 @@ uint8 _SpellScript::EffectHook::GetAffectedEffectsMask(SpellEntry const* spellEn uint8 mask = 0; if ((effIndex == EFFECT_ALL) || (effIndex == EFFECT_FIRST_FOUND)) { - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if ((effIndex == EFFECT_FIRST_FOUND) && mask) return mask; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 5c731dadb19..97dda09c859 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1355,7 +1355,7 @@ void World::SetInitialWorldSettings() sLog->outString("Loading Creature Reputation OnKill Data..."); sObjectMgr->LoadReputationOnKill(); - sLog->outString( "Loading Reputation Spillover Data..." ); + sLog->outString("Loading Reputation Spillover Data..." ); sObjectMgr->LoadReputationSpilloverTemplate(); sLog->outString("Loading Points Of Interest Data..."); @@ -2513,7 +2513,7 @@ void World::UpdateSessions(uint32 diff) WorldSession * pSession = itr->second; WorldSessionFilter updater(pSession); - if(!pSession->Update(diff, updater)) // As interval = 0 + if (!pSession->Update(diff, updater)) // As interval = 0 { if (!RemoveQueuedPlayer(itr->second) && itr->second && getIntConfig(CONFIG_INTERVAL_DISCONNECT_TOLERANCE)) m_disconnects[itr->second->GetAccountId()] = time(NULL); @@ -2722,7 +2722,7 @@ void World::ResetRandomBG() { sLog->outDetail("Random BG status reset for all characters."); CharacterDatabase.Execute("DELETE FROM character_battleground_random"); - for(SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) + for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) if (itr->second->GetPlayer()) itr->second->GetPlayer()->SetRandomWinner(false); |