diff options
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 8e4bd3052a7..ce57dce8020 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1323,12 +1323,12 @@ void Player::Update( uint32 p_time ) m_zoneUpdateTimer -= p_time; } - if (m_timeSyncTimer > 0)
- {
- if(p_time >= m_timeSyncTimer)
- SendTimeSync();
- else
- m_timeSyncTimer -= p_time;
+ if (m_timeSyncTimer > 0) + { + if(p_time >= m_timeSyncTimer) + SendTimeSync(); + else + m_timeSyncTimer -= p_time; } if (isAlive()) @@ -7139,11 +7139,11 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl armor = ssvarmor; } - if (armor)
- {
- UnitModifierType modType = TOTAL_VALUE;
- if (proto->Class == ITEM_CLASS_ARMOR)
- {
+ if (armor) + { + UnitModifierType modType = TOTAL_VALUE; + if (proto->Class == ITEM_CLASS_ARMOR) + { switch (proto->SubClass) { case ITEM_SUBCLASS_ARMOR_CLOTH: @@ -7153,13 +7153,13 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl case ITEM_SUBCLASS_ARMOR_SHIELD: modType = BASE_VALUE; break; - }
- }
- HandleStatModifier(UNIT_MOD_ARMOR, modType, float(armor), apply);
- }
-
- // Add armor bonus from ArmorDamageModifier if > 0
- if (proto->ArmorDamageModifier > 0)
+ } + } + HandleStatModifier(UNIT_MOD_ARMOR, modType, float(armor), apply); + } + + // Add armor bonus from ArmorDamageModifier if > 0 + if (proto->ArmorDamageModifier > 0) HandleStatModifier(UNIT_MOD_ARMOR, TOTAL_VALUE, float(proto->ArmorDamageModifier), apply); if (proto->Block) @@ -7320,13 +7320,13 @@ void Player::_ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType att } if (!item->IsBroken()&&item->IsFitToSpellRequirements(aura->GetSpellProto())) - {
- HandleStatModifier(unitMod, unitModType, float(aura->GetAmount()),apply);
-
- if (unitModType == TOTAL_PCT)
- ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT,aura->GetAmount()/100.0f,apply);
- else
- ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS,aura->GetAmount(),apply);
+ { + HandleStatModifier(unitMod, unitModType, float(aura->GetAmount()),apply); + + if (unitModType == TOTAL_PCT) + ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT,aura->GetAmount()/100.0f,apply); + else + ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS,aura->GetAmount(),apply); } } @@ -20236,7 +20236,7 @@ void Player::SendInitialPacketsAfterAddToMap() GetZoneAndAreaId(newzone,newarea); UpdateZone(newzone,newarea); // also call SendInitWorldStates(); - ResetTimeSync();
+ ResetTimeSync(); SendTimeSync(); CastSpell(this, SPELL_LOGINEFFECT_836, true); // LOGINEFFECT @@ -23042,7 +23042,7 @@ void Player::ActivateSpec(uint8 spec) InitTalentForLevel(); // Let client clear his current Actions - SendActionButtons(2);
+ SendActionButtons(2); m_actionButtons.clear(); if (QueryResult *result = CharacterDatabase.PQuery("SELECT button,action,type FROM character_action WHERE guid = '%u' AND spec = '%u' ORDER BY button", GetGUIDLow(), m_activeSpec)) _LoadActions(result, false); @@ -23057,20 +23057,20 @@ void Player::ActivateSpec(uint8 spec) SetPower(pw, 0); } -void Player::ResetTimeSync()
-{
- m_timeSyncCount = 0;
- m_timeSyncTimer = 0;
+void Player::ResetTimeSync() +{ + m_timeSyncCount = 0; + m_timeSyncTimer = 0; } -void Player::SendTimeSync()
-{
- WorldPacket data(SMSG_TIME_SYNC_REQ, 4);
- data << uint32(m_timeSyncCount++);
- GetSession()->SendPacket(&data);
-
- // Send another opcode in 10s again
- m_timeSyncTimer = 10000;
+void Player::SendTimeSync() +{ + WorldPacket data(SMSG_TIME_SYNC_REQ, 4); + data << uint32(m_timeSyncCount++); + GetSession()->SendPacket(&data); + + // Send another opcode in 10s again + m_timeSyncTimer = 10000; } void Player::SetReputation(uint32 factionentry, uint32 value) |