diff options
| author | leak <leakzx@googlemail.com> | 2011-01-26 01:03:35 +0100 |
|---|---|---|
| committer | leak <leakzx@googlemail.com> | 2011-01-26 01:03:35 +0100 |
| commit | 137b079eea2c8bff3bfa33099c016502beeb868a (patch) | |
| tree | 876ce4404a299c6ed7cccf79fc04d8ad4b29b385 /src/server/game/Entities | |
| parent | 57f85ab7da3c1759a0cef3bd0497253c54bf1218 (diff) | |
Core: Generic cleanup (tab2spaces/trailing whitespace removal)
Diffstat (limited to 'src/server/game/Entities')
| -rwxr-xr-x | src/server/game/Entities/Creature/CreatureGroups.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Pet/Pet.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 30 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 10 | ||||
| -rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.h | 2 |
5 files changed, 23 insertions, 23 deletions
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 4a372273b02..63f3be8d430 100755 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -71,7 +71,7 @@ void CreatureGroupManager::LoadCreatureFormations() { uint32 oldMSTime = getMSTime(); - for (CreatureGroupInfoType::iterator itr = CreatureGroupMap.begin(); itr != CreatureGroupMap.end(); ++itr) // for reload case + for (CreatureGroupInfoType::iterator itr = CreatureGroupMap.begin(); itr != CreatureGroupMap.end(); ++itr) // for reload case delete itr->second; CreatureGroupMap.clear(); diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 0ebdb31fc81..fb67cb5fb0f 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -695,7 +695,7 @@ void Pet::GivePetXP(uint32 xp) if (!isAlive()) return; - + uint8 maxlevel = std::min((uint8)sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL), GetOwner()->getLevel()); uint8 petlevel = getLevel(); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index aa9d2bf9446..dcfb2becc5f 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7699,7 +7699,7 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl } -void Player::_ApplyWeaponDamage(uint8 slot, ItemPrototype const *proto, ScalingStatValuesEntry const *ssv, bool apply) +void Player::_ApplyWeaponDamage(uint8 slot, ItemPrototype const *proto, ScalingStatValuesEntry const *ssv, bool apply) { WeaponAttackType attType = BASE_ATTACK; float damage = 0.0f; @@ -9300,7 +9300,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid) data << uint32(4324) << uint32(1); // 15 BG_IC_GATE_WEST_A_WS_OPEN data << uint32(4325) << uint32(1); // 16 BG_IC_GATE_EAST_A_WS_OPEN data << uint32(4317) << uint32(1); // 17 unknown - + data << uint32(4301) << uint32(1); // 18 BG_IC_DOCKS_UNCONTROLLED data << uint32(4296) << uint32(1); // 19 BG_IC_HANGAR_UNCONTROLLED data << uint32(4306) << uint32(1); // 20 BG_IC_QUARRY_UNCONTROLLED @@ -11636,7 +11636,7 @@ Item* Player::StoreNewItem(ItemPosCountVec const& dest, uint32 item, bool update const ItemPrototype *proto = pItem->GetProto(); for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) if (proto->Spells[i].SpellTrigger == ITEM_SPELLTRIGGER_ON_NO_DELAY_USE && proto->Spells[i].SpellId > 0) // On obtain trigger - CastSpell(this, proto->Spells[i].SpellId, true, pItem); + CastSpell(this, proto->Spells[i].SpellId, true, pItem); if (allowedLooters && pItem->GetProto()->GetMaxStackSize() == 1 && pItem->IsSoulBound()) { @@ -13651,7 +13651,7 @@ void Player::UpdateSkillEnchantments(uint16 skill_id, uint16 curr_value, uint16 // 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) && !m_items[i]->GetProto()->Socket[slot-SOCK_ENCHANTMENT_SLOT].Color) { SpellItemEnchantmentEntry const *pPrismaticEnchant = sSpellItemEnchantmentStore.LookupEntry(m_items[i]->GetEnchantmentId(PRISMATIC_ENCHANTMENT_SLOT)); @@ -15420,7 +15420,7 @@ void Player::ItemAddedQuestCheck(uint32 entry, uint32 count) { uint16 additemcount = curitemcount + count <= reqitemcount ? count : reqitemcount - curitemcount; q_status.m_itemcount[j] += additemcount; - + m_QuestStatusSave[questid] = true; SendQuestUpdateAddItem(qInfo, j, additemcount); @@ -15464,7 +15464,7 @@ void Player::ItemRemovedQuestCheck(uint32 entry, uint32 count) { uint16 remitemcount = curitemcount <= reqitemcount ? count : count + reqitemcount - curitemcount; q_status.m_itemcount[j] = (curitemcount <= remitemcount) ? 0 : curitemcount - remitemcount; - + m_QuestStatusSave[questid] = true; IncompleteQuest(questid); @@ -15534,7 +15534,7 @@ void Player::KilledMonsterCredit(uint32 entry, uint64 guid) if (curkillcount < reqkillcount) { q_status.m_creatureOrGOcount[j] = curkillcount + addkillcount; - + m_QuestStatusSave[questid] = true; SendQuestUpdateAddCreatureOrGo(qInfo, guid, j, curkillcount, addkillcount); @@ -15613,7 +15613,7 @@ void Player::CastedCreatureOrGO(uint32 entry, uint64 guid, uint32 spell_id) if (curCastCount < reqCastCount) { q_status.m_creatureOrGOcount[j] = curCastCount + addCastCount; - + m_QuestStatusSave[questid] = true; SendQuestUpdateAddCreatureOrGo(qInfo, guid, j, curCastCount, addCastCount); @@ -15670,7 +15670,7 @@ void Player::TalkedToCreature(uint32 entry, uint64 guid) if (curTalkCount < reqTalkCount) { q_status.m_creatureOrGOcount[j] = curTalkCount + addTalkCount; - + m_QuestStatusSave[questid] = true; SendQuestUpdateAddCreatureOrGo(qInfo, guid, j, curTalkCount, addTalkCount); @@ -16875,7 +16875,7 @@ void Player::_LoadAuras(PreparedQueryResult result, uint32 timediff) /* 0 1 2 3 4 5 6 7 8 9 10 QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_mask,recalculate_mask,stackcount,amount0,amount1,amount2,base_amount0,base_amount1,base_amount2, 11 12 13 - maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'",GetGUIDLow()); + maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'",GetGUIDLow()); */ if (result) @@ -17339,8 +17339,8 @@ void Player::_LoadQuestStatus(PreparedQueryResult result) uint16 slot = 0; //// 0 1 2 3 4 5 6 7 8 9 10 - //QueryResult *result = CharacterDatabase.PQuery("SELECT quest, status, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, itemcount1, itemcount2, itemcount3, - // 11 + //QueryResult *result = CharacterDatabase.PQuery("SELECT quest, status, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, itemcount1, itemcount2, itemcount3, + // 11 // itemcount4 FROM character_queststatus WHERE guid = '%u'", GetGUIDLow()); if (result) @@ -18251,7 +18251,7 @@ void Player::_SaveAuras(SQLTransaction& trans) stmt->setUInt64(index++, itr->second->GetCastItemGUID()); stmt->setUInt32(index++, itr->second->GetId()); stmt->setUInt8(index++, effMask); - stmt->setUInt8(index++, recalculateMask); + stmt->setUInt8(index++, recalculateMask); stmt->setUInt8(index++, itr->second->GetStackAmount()); stmt->setInt32(index++, damage[0]); stmt->setInt32(index++, damage[1]); @@ -23912,7 +23912,7 @@ void Player::_SaveEquipmentSets(SQLTransaction& trans) stmt = CharacterDatabase.GetPreparedStatement(CHAR_ADD_EQUIP_SET); stmt->setUInt32(j++, GetGUIDLow()); stmt->setUInt64(j++, eqset.Guid); - stmt->setUInt32(j++, index); + stmt->setUInt32(j++, index); stmt->setString(j++, eqset.Name.c_str()); stmt->setString(j++, eqset.IconName.c_str()); for (uint8 i=0; i<EQUIPMENT_SLOT_END; ++i) @@ -24506,7 +24506,7 @@ void Player::_LoadInstanceTimeRestrictions(PreparedQueryResult result) if (!result) return; - do + do { Field* fields = result->Fetch(); _instanceResetTimes.insert(InstanceTimeMap::value_type(fields[0].GetUInt32(), fields[1].GetUInt64())); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 5f3a6e2a73f..08138c5499f 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -427,7 +427,7 @@ void Unit::SendMonsterMoveTransport(Unit *vehicleOwner) data << GetPositionY() - vehicleOwner->GetPositionY(); data << GetPositionZ() - vehicleOwner->GetPositionZ(); data << uint32(getMSTime()); // should be an increasing constant that indicates movement packet count - data << uint8(SPLINETYPE_FACING_ANGLE); + data << uint8(SPLINETYPE_FACING_ANGLE); data << GetTransOffsetO(); // facing angle? data << uint32(SPLINEFLAG_TRANSPORT); data << uint32(GetTransTime()); // move time @@ -6477,7 +6477,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger } else if (damage > 0) triggered_spell_id = 58597; - + target = this; break; } @@ -7680,7 +7680,7 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura, break; // Discerning Eye of the Beast case 59915: - { + { CastSpell(this, 59914, true); // 59914 already has correct basepoints in DBC, no need for custom bp *handled = true; break; @@ -8534,7 +8534,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig // Item - Shaman T10 Enhancement 4P Bonus if (AuraEffect const* aurEff = GetAuraEffect(70832, 0)) if (Aura const* maelstrom = GetAura(53817)) - if ((maelstrom->GetStackAmount() == maelstrom->GetSpellProto()->StackAmount) && roll_chance_i(aurEff->GetAmount())) + if ((maelstrom->GetStackAmount() == maelstrom->GetSpellProto()->StackAmount) && roll_chance_i(aurEff->GetAmount())) CastSpell(this, 70831, true, castItem, triggeredByAura); // have rank dependent proc chance, ignore too often cases @@ -14144,7 +14144,7 @@ void Unit::StopMoving() //if (fabs(GetPositionZ() - z) < 2.0f) // Relocate(GetPositionX(), GetPositionY(), z); //Relocate(GetPositionX(), GetPositionY(),GetPositionZ()); - + if (!(GetUnitMovementFlags() & MOVEMENTFLAG_ONTRANSPORT)) SendMonsterStop(); } diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 4a540964b51..4001ae6a0dc 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -124,7 +124,7 @@ class Vehicle bool HasEmptySeat(int8 seatId) const; Unit *GetPassenger(int8 seatId) const; int8 GetNextEmptySeat(int8 seatId, bool next, bool byAura = false) const; - + bool AddPassenger(Unit *passenger, int8 seatId = -1, bool byAura = false); void EjectPassenger(Unit* passenger, Unit* controller); void RemovePassenger(Unit *passenger); |
