mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9844] Fix some whitespace errors.

Browse source 
Signed-off-by: hunuza <hunuza@gmail.com>
This commit is contained in:
hunuza 2010-05-07 12:24:29 +02:00
parent ec0141261a
commit 68abd76c97
20 changed files with 88 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/AchievementMgr.cpp
View file

@ -1694,7 +1694,7 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry)
// completed as have req. count of completed criterias // completed as have req. count of completed criterias
if(achievementForTestCount > 0 && achievementForTestCount <= count) if(achievementForTestCount > 0 && achievementForTestCount <= count)
return true; return true;
} }
// all criterias completed requirement // all criterias completed requirement

6
src/game/BattleGroundAV.cpp
View file

@ -265,7 +265,7 @@ void BattleGroundAV::Update(uint32 diff)
if (m_Nodes[i].Timer > diff) if (m_Nodes[i].Timer > diff)
m_Nodes[i].Timer -= diff; m_Nodes[i].Timer -= diff;
else else
EventPlayerDestroyedPoint(i); EventPlayerDestroyedPoint(i);
} }
} }
} }
@ -477,9 +477,9 @@ void BattleGroundAV::ChangeMineOwner(uint8 mine, uint32 team)
bool BattleGroundAV::PlayerCanDoMineQuest(int32 GOId, uint32 team) bool BattleGroundAV::PlayerCanDoMineQuest(int32 GOId, uint32 team)
{ {
if (GOId == BG_AV_OBJECTID_MINE_N) if (GOId == BG_AV_OBJECTID_MINE_N)
return (m_Mine_Owner[BG_AV_NORTH_MINE] == GetTeamIndexByTeamId(team)); return (m_Mine_Owner[BG_AV_NORTH_MINE] == GetTeamIndexByTeamId(team));
if (GOId == BG_AV_OBJECTID_MINE_S) if (GOId == BG_AV_OBJECTID_MINE_S)
return (m_Mine_Owner[BG_AV_SOUTH_MINE] == GetTeamIndexByTeamId(team)); return (m_Mine_Owner[BG_AV_SOUTH_MINE] == GetTeamIndexByTeamId(team));
return true; // cause it's no mine'object it is ok if this is true return true; // cause it's no mine'object it is ok if this is true
} }

2
src/game/Chat.cpp
View file

@ -2239,7 +2239,7 @@ uint32 ChatHandler::extractAccountId(char* args, std::string* accountName /*= NU
if (accountName) if (accountName)
sAccountMgr.GetName(account_id, *accountName); sAccountMgr.GetName(account_id, *accountName);
if (targetIfNullArg) if (targetIfNullArg)
*targetIfNullArg = targetPlayer; *targetIfNullArg = targetPlayer;

2
src/game/DBCStructure.h
View file

@ -337,7 +337,7 @@ struct AchievementCriteriaEntry
uint32 rollValue; // 3 uint32 rollValue; // 3
uint32 count; // 4 uint32 count; // 4
} roll_need_on_loot; } roll_need_on_loot;
// ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT = 51 // ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT = 51
struct struct
{ {
uint32 rollValue; // 3 uint32 rollValue; // 3

2
src/game/Level3.cpp
View file

@ -961,7 +961,7 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char* args)
uint32 targetAccountId = extractAccountId((char*)args, &account_name); uint32 targetAccountId = extractAccountId((char*)args, &account_name);
if (!targetAccountId) if (!targetAccountId)
return false; return false;
char *szPassword1 = strtok (NULL," "); char *szPassword1 = strtok (NULL," ");
char *szPassword2 = strtok (NULL," "); char *szPassword2 = strtok (NULL," ");
if (!szPassword1 || !szPassword2) if (!szPassword1 || !szPassword2)

8
src/game/Map.cpp
View file

@ -1560,13 +1560,13 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R
int delta = int((liquid_level - z) * 10); int delta = int((liquid_level - z) * 10);
// Get position delta // Get position delta
if (delta > 20) // Under water if (delta > 20) // Under water
return LIQUID_MAP_UNDER_WATER; return LIQUID_MAP_UNDER_WATER;
if (delta > 0 ) // In water if (delta > 0 ) // In water
return LIQUID_MAP_IN_WATER; return LIQUID_MAP_IN_WATER;
if (delta > -1) // Walk on water if (delta > -1) // Walk on water
return LIQUID_MAP_WATER_WALK; return LIQUID_MAP_WATER_WALK;
// Above water // Above water
return LIQUID_MAP_ABOVE_WATER; return LIQUID_MAP_ABOVE_WATER;
} }

2
src/game/MiscHandler.cpp
View file

@ -1312,7 +1312,7 @@ void WorldSession::HandleSetTitleOpcode( WorldPacket & recv_data )
// -1 at none // -1 at none
if(title > 0 && title < MAX_TITLE_INDEX) if(title > 0 && title < MAX_TITLE_INDEX)
{ {
if(!GetPlayer()->HasTitle(title)) if(!GetPlayer()->HasTitle(title))
return; return;
} }
else else

4
src/game/MotionMaster.cpp
View file

@ -421,7 +421,7 @@ void MotionMaster::propagateSpeedChange()
MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
{ {
if(empty()) if(empty())
return IDLE_MOTION_TYPE; return IDLE_MOTION_TYPE;
return top()->GetMovementGeneratorType(); return top()->GetMovementGeneratorType();
} }
@ -429,7 +429,7 @@ MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
bool MotionMaster::GetDestination(float &x, float &y, float &z) bool MotionMaster::GetDestination(float &x, float &y, float &z)
{ {
if(empty()) if(empty())
return false; return false;
return top()->GetDestination(x,y,z); return top()->GetDestination(x,y,z);
} }

2
src/game/Pet.cpp
View file

@ -466,7 +466,7 @@ void Pet::setDeathState(DeathState s) // overwrite virtual
SetUInt32Value( UNIT_DYNAMIC_FLAGS, 0x00 ); SetUInt32Value( UNIT_DYNAMIC_FLAGS, 0x00 );
RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
//lose happiness when died and not in BG/Arena //lose happiness when died and not in BG/Arena
MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId()); MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId());
if(!mapEntry || (mapEntry->map_type != MAP_ARENA && mapEntry->map_type != MAP_BATTLEGROUND)) if(!mapEntry || (mapEntry->map_type != MAP_ARENA && mapEntry->map_type != MAP_BATTLEGROUND))
ModifyPower(POWER_HAPPINESS, -HAPPINESS_LEVEL_SIZE); ModifyPower(POWER_HAPPINESS, -HAPPINESS_LEVEL_SIZE);

4
src/game/RandomMovementGenerator.cpp
View file

@ -178,8 +178,8 @@ bool RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32
} }
else if (creature.isPet() && creature.GetOwner() && !creature.IsWithinDist(creature.GetOwner(), PET_FOLLOW_DIST+2.5f)) else if (creature.isPet() && creature.GetOwner() && !creature.IsWithinDist(creature.GetOwner(), PET_FOLLOW_DIST+2.5f))
{ {
creature.AddSplineFlag(SPLINEFLAG_WALKMODE); creature.AddSplineFlag(SPLINEFLAG_WALKMODE);
_setRandomLocation(creature); _setRandomLocation(creature);
} }
} }
return true; return true;

4
src/game/Spell.cpp
View file

@ -5258,8 +5258,8 @@ SpellCastResult Spell::CheckCasterAuras() const
{ {
if(!(*itr)->isAffectedOnSpell(m_spellInfo)) if(!(*itr)->isAffectedOnSpell(m_spellInfo))
{ {
prevented_reason = SPELL_FAILED_CASTER_AURASTATE; prevented_reason = SPELL_FAILED_CASTER_AURASTATE;
break; break;
} }
} }
} }

24
src/game/SpellAuras.cpp
View file

@ -3998,7 +3998,7 @@ void Aura::HandleModStealth(bool apply, bool Real)
if (apply) if (apply)
{ {
// drop flag at stealth in bg // drop flag at stealth in bg
m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION); m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
// only at real aura add // only at real aura add
if (Real) if (Real)
@ -4082,7 +4082,7 @@ void Aura::HandleInvisibility(bool apply, bool Real)
{ {
m_target->m_invisibilityMask |= (1 << m_modifier.m_miscvalue); m_target->m_invisibilityMask |= (1 << m_modifier.m_miscvalue);
m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION); m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
if(Real && m_target->GetTypeId()==TYPEID_PLAYER) if(Real && m_target->GetTypeId()==TYPEID_PLAYER)
{ {
@ -5001,7 +5001,7 @@ void Aura::HandlePeriodicDamagePCT(bool apply, bool /*Real*/)
void Aura::HandlePeriodicLeech(bool apply, bool /*Real*/) void Aura::HandlePeriodicLeech(bool apply, bool /*Real*/)
{ {
m_isPeriodic = apply; m_isPeriodic = apply;
// For prevent double apply bonuses // For prevent double apply bonuses
bool loading = (m_target->GetTypeId() == TYPEID_PLAYER && ((Player*)m_target)->GetSession()->PlayerLoading()); bool loading = (m_target->GetTypeId() == TYPEID_PLAYER && ((Player*)m_target)->GetSession()->PlayerLoading());
@ -6898,7 +6898,7 @@ void Aura::HandleSchoolAbsorb(bool apply, bool Real)
//Borrowed Time //Borrowed Time
Unit::AuraList const& borrowedTime = caster->GetAurasByType(SPELL_AURA_DUMMY); Unit::AuraList const& borrowedTime = caster->GetAurasByType(SPELL_AURA_DUMMY);
for(Unit::AuraList::const_iterator itr = borrowedTime.begin(); itr != borrowedTime.end(); ++itr) for(Unit::AuraList::const_iterator itr = borrowedTime.begin(); itr != borrowedTime.end(); ++itr)
{ {
SpellEntry const* i_spell = (*itr)->GetSpellProto(); SpellEntry const* i_spell = (*itr)->GetSpellProto();
if(i_spell->SpellFamilyName==SPELLFAMILY_PRIEST && i_spell->SpellIconID == 2899 && i_spell->EffectMiscValue[(*itr)->GetEffIndex()] == 24) if(i_spell->SpellFamilyName==SPELLFAMILY_PRIEST && i_spell->SpellIconID == 2899 && i_spell->EffectMiscValue[(*itr)->GetEffIndex()] == 24)
{ {
@ -7082,7 +7082,7 @@ void Aura::PeriodicTick()
else else
pdamage = uint32(m_target->GetMaxHealth()*amount/100); pdamage = uint32(m_target->GetMaxHealth()*amount/100);
// SpellDamageBonus for magic spells // SpellDamageBonus for magic spells
if(GetSpellProto()->DmgClass == SPELL_DAMAGE_CLASS_NONE || GetSpellProto()->DmgClass == SPELL_DAMAGE_CLASS_MAGIC) if(GetSpellProto()->DmgClass == SPELL_DAMAGE_CLASS_NONE || GetSpellProto()->DmgClass == SPELL_DAMAGE_CLASS_MAGIC)
pdamage = m_target->SpellDamageBonusTaken(pCaster, GetSpellProto(), pdamage, DOT, GetStackAmount()); pdamage = m_target->SpellDamageBonusTaken(pCaster, GetSpellProto(), pdamage, DOT, GetStackAmount());
@ -8304,19 +8304,19 @@ void Aura::HandleAuraModAllCritChance(bool apply, bool Real)
void Aura::HandleAllowOnlyAbility(bool apply, bool Real) void Aura::HandleAllowOnlyAbility(bool apply, bool Real)
{ {
if(!Real) if(!Real)
return; return;
if(apply) if(apply)
{ {
m_target->setAttackTimer(BASE_ATTACK,m_duration); m_target->setAttackTimer(BASE_ATTACK,m_duration);
m_target->setAttackTimer(RANGED_ATTACK,m_duration); m_target->setAttackTimer(RANGED_ATTACK,m_duration);
m_target->setAttackTimer(OFF_ATTACK,m_duration); m_target->setAttackTimer(OFF_ATTACK,m_duration);
} }
else else
{ {
m_target->resetAttackTimer(BASE_ATTACK); m_target->resetAttackTimer(BASE_ATTACK);
m_target->resetAttackTimer(RANGED_ATTACK); m_target->resetAttackTimer(RANGED_ATTACK);
m_target->resetAttackTimer(OFF_ATTACK); m_target->resetAttackTimer(OFF_ATTACK);
} }
m_target->UpdateDamagePhysical(BASE_ATTACK); m_target->UpdateDamagePhysical(BASE_ATTACK);

16
src/game/SpellEffects.cpp
View file

@ -663,7 +663,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
if (m_spellInfo->SpellIconID == 1578) if (m_spellInfo->SpellIconID == 1578)
{ {
if (m_caster->HasAura(57627)) // Charge 6 sec post-affect if (m_caster->HasAura(57627)) // Charge 6 sec post-affect
damage *= 2; damage *= 2;
} }
// Mongoose Bite // Mongoose Bite
else if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x000000002)) && m_spellInfo->SpellVisual[0]==342) else if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x000000002)) && m_spellInfo->SpellVisual[0]==342)
@ -2300,8 +2300,8 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
((*itr)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000200000)) && ((*itr)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000200000)) &&
(*itr)->GetCastItemGUID() == item->GetGUID()) (*itr)->GetCastItemGUID() == item->GetGUID())
{ {
m_damage += m_damage * damage / 100; m_damage += m_damage * damage / 100;
return; return;
} }
} }
} }
@ -3781,7 +3781,7 @@ void Spell::EffectSummonType(SpellEffectIndex eff_idx)
case SUMMON_PROP_TYPE_DK: case SUMMON_PROP_TYPE_DK:
case SUMMON_PROP_TYPE_CONSTRUCT: case SUMMON_PROP_TYPE_CONSTRUCT:
{ {
// JC golems - 32804, etc -- fits much better totem AI // JC golems - 32804, etc -- fits much better totem AI
if(m_spellInfo->SpellIconID == 2056) if(m_spellInfo->SpellIconID == 2056)
DoSummonTotem(eff_idx); DoSummonTotem(eff_idx);
if(prop_id == 832) // scrapbot if(prop_id == 832) // scrapbot
@ -6962,13 +6962,13 @@ void Spell::DoSummonCritter(SpellEffectIndex eff_idx, uint32 forceFaction)
// If dest location if present // If dest location if present
if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
{ {
x = m_targets.m_destX; x = m_targets.m_destX;
y = m_targets.m_destY; y = m_targets.m_destY;
z = m_targets.m_destZ; z = m_targets.m_destZ;
} }
// Summon if dest location not present near caster // Summon if dest location not present near caster
else else
m_caster->GetClosePoint(x, y, z, critter->GetObjectSize()); m_caster->GetClosePoint(x, y, z, critter->GetObjectSize());
critter->Relocate(x, y, z, m_caster->GetOrientation()); critter->Relocate(x, y, z, m_caster->GetOrientation());
critter->SetSummonPoint(x, y, z, m_caster->GetOrientation()); critter->SetSummonPoint(x, y, z, m_caster->GetOrientation());

2
src/game/Transports.cpp
View file

@ -90,7 +90,7 @@ void MapManager::LoadTransports()
uint32 mapid; uint32 mapid;
x = t->m_WayPoints[0].x; y = t->m_WayPoints[0].y; z = t->m_WayPoints[0].z; mapid = t->m_WayPoints[0].mapid; o = 1; x = t->m_WayPoints[0].x; y = t->m_WayPoints[0].y; z = t->m_WayPoints[0].z; mapid = t->m_WayPoints[0].mapid; o = 1;
// creates the Gameobject // creates the Gameobject
if(!t->Create(entry, mapid, x, y, z, o, 100, 0)) if(!t->Create(entry, mapid, x, y, z, o, 100, 0))
{ {
delete t; delete t;

84
src/game/Unit.cpp
View file

@ -1340,13 +1340,13 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
// Physical Immune check // Physical Immune check
if (damageInfo->target->IsImmunedToDamage(damageInfo->damageSchoolMask)) if (damageInfo->target->IsImmunedToDamage(damageInfo->damageSchoolMask))
{ {
damageInfo->HitInfo |= HITINFO_NORMALSWING; damageInfo->HitInfo |= HITINFO_NORMALSWING;
damageInfo->TargetState = VICTIMSTATE_IS_IMMUNE; damageInfo->TargetState = VICTIMSTATE_IS_IMMUNE;
damageInfo->procEx |=PROC_EX_IMMUNE; damageInfo->procEx |=PROC_EX_IMMUNE;
damageInfo->damage = 0; damageInfo->damage = 0;
damageInfo->cleanDamage = 0; damageInfo->cleanDamage = 0;
return; return;
} }
damage += CalculateDamage (damageInfo->attackType, false); damage += CalculateDamage (damageInfo->attackType, false);
// Add melee damage bonus // Add melee damage bonus
@ -1671,33 +1671,33 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
AuraList const& vDamageShields = pVictim->GetAurasByType(SPELL_AURA_DAMAGE_SHIELD); AuraList const& vDamageShields = pVictim->GetAurasByType(SPELL_AURA_DAMAGE_SHIELD);
for(AuraList::const_iterator i = vDamageShields.begin(); i != vDamageShields.end();) for(AuraList::const_iterator i = vDamageShields.begin(); i != vDamageShields.end();)
{ {
if (alreadyDone.find(*i) == alreadyDone.end()) if (alreadyDone.find(*i) == alreadyDone.end())
{ {
alreadyDone.insert(*i); alreadyDone.insert(*i);
uint32 damage=(*i)->GetModifier()->m_amount; uint32 damage=(*i)->GetModifier()->m_amount;
SpellEntry const *i_spellProto = (*i)->GetSpellProto(); SpellEntry const *i_spellProto = (*i)->GetSpellProto();
//Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist? //Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist?
//uint32 absorb; //uint32 absorb;
//uint32 resist; //uint32 resist;
//CalcAbsorbResist(pVictim, SpellSchools(spellProto->School), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist); //CalcAbsorbResist(pVictim, SpellSchools(spellProto->School), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
//damage-=absorb + resist; //damage-=absorb + resist;
pVictim->DealDamageMods(this,damage,NULL); pVictim->DealDamageMods(this,damage,NULL);
WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4)); WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4));
data << uint64(pVictim->GetGUID()); data << uint64(pVictim->GetGUID());
data << uint64(GetGUID()); data << uint64(GetGUID());
data << uint32(i_spellProto->Id); data << uint32(i_spellProto->Id);
data << uint32(damage); // Damage data << uint32(damage); // Damage
data << uint32(0); // Overkill data << uint32(0); // Overkill
data << uint32(i_spellProto->SchoolMask); data << uint32(i_spellProto->SchoolMask);
pVictim->SendMessageToSet(&data, true ); pVictim->SendMessageToSet(&data, true );
pVictim->DealDamage(this, damage, 0, SPELL_DIRECT_DAMAGE, GetSpellSchoolMask(i_spellProto), i_spellProto, true); pVictim->DealDamage(this, damage, 0, SPELL_DIRECT_DAMAGE, GetSpellSchoolMask(i_spellProto), i_spellProto, true);
i = vDamageShields.begin(); i = vDamageShields.begin();
} }
else else
++i; ++i;
} }
} }
@ -2314,7 +2314,7 @@ void Unit::CalculateAbsorbResistBlock(Unit *pCaster, SpellNonMeleeDamage *damage
default: default:
break; break;
} }
if (blocked) if (blocked)
{ {
damageInfo->blocked = GetShieldBlockValue(); damageInfo->blocked = GetShieldBlockValue();
@ -5563,7 +5563,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
return true; return true;
// Crititcal counted -> roll chance // Crititcal counted -> roll chance
if (roll_chance_i(triggerAmount)) if (roll_chance_i(triggerAmount))
CastSpell(this, 48108, true, castItem, triggeredByAura); CastSpell(this, 48108, true, castItem, triggeredByAura);
} }
mod->m_amount = 25; mod->m_amount = 25;
return true; return true;
@ -7670,8 +7670,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
if (!(10*(int32(GetHealth() - damage)) < int32(3 * GetMaxHealth()))) if (!(10*(int32(GetHealth() - damage)) < int32(3 * GetMaxHealth())))
return false; return false;
if(pVictim && pVictim->isAlive()) if(pVictim && pVictim->isAlive())
pVictim->getThreatManager().modifyThreatPercent(this,-10); pVictim->getThreatManager().modifyThreatPercent(this,-10);
basepoints[0] = triggerAmount * GetMaxHealth() / 100; basepoints[0] = triggerAmount * GetMaxHealth() / 100;
trigger_spell_id = 31616; trigger_spell_id = 31616;
@ -7901,7 +7901,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
// try detect target manually if not set // try detect target manually if not set
if (target == NULL) if (target == NULL)
target = !(procFlags & PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL) && IsPositiveSpell(trigger_spell_id) ? this : pVictim; target = !(procFlags & PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL) && IsPositiveSpell(trigger_spell_id) ? this : pVictim;
// default case // default case
if (!target || target!=this && !target->isAlive()) if (!target || target!=this && !target->isAlive())
@ -9789,7 +9789,7 @@ uint32 Unit::SpellHealingBonusTaken(Unit *pCaster, SpellEntry const *spellProto,
// Healing Done // Healing Done
// Done total percent damage auras // Done total percent damage auras
int32 TakenTotal = 0; int32 TakenTotal = 0;
// Taken fixed damage bonus auras // Taken fixed damage bonus auras
int32 TakenAdvertisedBenefit = SpellBaseHealingBonusTaken(GetSpellSchoolMask(spellProto)); int32 TakenAdvertisedBenefit = SpellBaseHealingBonusTaken(GetSpellSchoolMask(spellProto));
@ -10179,7 +10179,7 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
// Frost Strike // Frost Strike
if (spellProto && spellProto->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && spellProto->SpellFamilyFlags & UI64LIT(0x0000000400000000)) if (spellProto && spellProto->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && spellProto->SpellFamilyFlags & UI64LIT(0x0000000400000000))
{ {
// search disease // search disease
bool found = false; bool found = false;
Unit::AuraMap const& auras = pVictim->GetAuras(); Unit::AuraMap const& auras = pVictim->GetAuras();
@ -10308,7 +10308,7 @@ uint32 Unit::MeleeDamageBonusTaken(Unit *pCaster, uint32 pdamage,WeaponAttackTyp
// FLAT damage bonus auras // FLAT damage bonus auras
// ======================= // =======================
int32 TakenFlat = 0; int32 TakenFlat = 0;
// ..taken flat (base at attack power for marked target and base at attack power for creature type) // ..taken flat (base at attack power for marked target and base at attack power for creature type)
if (attType == RANGED_ATTACK) if (attType == RANGED_ATTACK)
TakenFlat += GetTotalAuraModifier(SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN); TakenFlat += GetTotalAuraModifier(SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN);
@ -10341,7 +10341,7 @@ uint32 Unit::MeleeDamageBonusTaken(Unit *pCaster, uint32 pdamage,WeaponAttackTyp
// special dummys/class scripts and other effects // special dummys/class scripts and other effects
// ============================================= // =============================================
// .. taken (dummy auras) // .. taken (dummy auras)
AuraList const& mDummyAuras = GetAurasByType(SPELL_AURA_DUMMY); AuraList const& mDummyAuras = GetAurasByType(SPELL_AURA_DUMMY);
for(AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) for(AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
@ -11601,7 +11601,7 @@ int32 Unit::CalculateSpellDuration(SpellEntry const* spellProto, SpellEffectInde
int32 durationMod_not_stack = target->GetMaxNegativeAuraModifierByMiscValue(SPELL_AURA_MECHANIC_DURATION_MOD_NOT_STACK, mechanic); int32 durationMod_not_stack = target->GetMaxNegativeAuraModifierByMiscValue(SPELL_AURA_MECHANIC_DURATION_MOD_NOT_STACK, mechanic);
if (!IsPositiveSpell(spellProto->Id)) if (!IsPositiveSpell(spellProto->Id))
durationMod_always += target->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DURATION_OF_MAGIC_EFFECTS, spellProto->DmgClass); durationMod_always += target->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DURATION_OF_MAGIC_EFFECTS, spellProto->DmgClass);
int32 durationMod = 0; int32 durationMod = 0;
// Select strongest negative mod // Select strongest negative mod
@ -12444,8 +12444,8 @@ bool InitTriggerAuraData()
{ {
for (int i=0;i<TOTAL_AURAS;++i) for (int i=0;i<TOTAL_AURAS;++i)
{ {
isTriggerAura[i]=false; isTriggerAura[i]=false;
isNonTriggerAura[i] = false; isNonTriggerAura[i] = false;
} }
isTriggerAura[SPELL_AURA_DUMMY] = true; isTriggerAura[SPELL_AURA_DUMMY] = true;
isTriggerAura[SPELL_AURA_MOD_CONFUSE] = true; isTriggerAura[SPELL_AURA_MOD_CONFUSE] = true;
@ -13044,7 +13044,7 @@ void Unit::SetStandState(uint8 state)
SetByteValue(UNIT_FIELD_BYTES_1, 0, state); SetByteValue(UNIT_FIELD_BYTES_1, 0, state);
if (IsStandState()) if (IsStandState())
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_SEATED); RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_SEATED);
if(GetTypeId()==TYPEID_PLAYER) if(GetTypeId()==TYPEID_PLAYER)
{ {

2
src/game/WorldSession.h
View file

@ -255,7 +255,7 @@ class MANGOS_DLL_SPEC WorldSession
m_tutorialState = TUTORIALDATA_CHANGED; m_tutorialState = TUTORIALDATA_CHANGED;
} }
} }
//used with item_page table //used with item_page table
bool SendItemInfo( uint32 itemid, WorldPacket data ); bool SendItemInfo( uint32 itemid, WorldPacket data );
//auction //auction

2
src/realmd/RealmList.cpp
View file

@ -92,7 +92,7 @@ void RealmList::UpdateRealm( uint32 ID, const std::string& name, const std::stri
realm.allowedSecurityLevel = allowedSecurityLevel; realm.allowedSecurityLevel = allowedSecurityLevel;
realm.populationLevel = popu; realm.populationLevel = popu;
Tokens tokens = StrSplit(builds, " "); Tokens tokens = StrSplit(builds, " ");
Tokens::iterator iter; Tokens::iterator iter;
for (iter = tokens.begin(); iter != tokens.end(); ++iter) for (iter = tokens.begin(); iter != tokens.end(); ++iter)

4
src/shared/ByteBuffer.h
View file

@ -297,7 +297,7 @@ class ByteBuffer
void read(uint8 *dest, size_t len) void read(uint8 *dest, size_t len)
{ {
if(_rpos + len > size()) if(_rpos + len > size())
throw ByteBufferException(false, _rpos, len, size()); throw ByteBufferException(false, _rpos, len, size());
memcpy(dest, &_storage[_rpos], len); memcpy(dest, &_storage[_rpos], len);
_rpos += len; _rpos += len;
} }
@ -406,7 +406,7 @@ class ByteBuffer
void put(size_t pos, const uint8 *src, size_t cnt) void put(size_t pos, const uint8 *src, size_t cnt)
{ {
if(pos + cnt > size()) if(pos + cnt > size())
throw ByteBufferException(true, pos, cnt, size()); throw ByteBufferException(true, pos, cnt, size());
memcpy(&_storage[pos], src, cnt); memcpy(&_storage[pos], src, cnt);
} }

2
src/shared/Log.cpp
View file

@ -169,7 +169,7 @@ void Log::SetLogLevel(char* level)
newLevel = LOG_LVL_DEBUG; newLevel = LOG_LVL_DEBUG;
m_logLevel = LogLevel(newLevel); m_logLevel = LogLevel(newLevel);
printf("LogLevel is %u\n", m_logLevel); printf("LogLevel is %u\n", m_logLevel);
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9843" #define REVISION_NR "9844"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__