Skip to content

Commit

Permalink
[9844] Fix some whitespace errors.
Browse files Browse the repository at this point in the history
Signed-off-by: hunuza <hunuza@gmail.com>
  • Loading branch information
hunuza committed May 7, 2010
1 parent 4b92024 commit fd5bd09
Show file tree
Hide file tree
Showing 20 changed files with 92 additions and 92 deletions.
2 changes: 1 addition & 1 deletion src/game/AchievementMgr.cpp
Expand Up @@ -1694,7 +1694,7 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry)

// completed as have req. count of completed criterias
if(achievementForTestCount > 0 && achievementForTestCount <= count)
return true;
return true;
}

// all criterias completed requirement
Expand Down
6 changes: 3 additions & 3 deletions src/game/BattleGroundAV.cpp
Expand Up @@ -265,7 +265,7 @@ void BattleGroundAV::Update(uint32 diff)
if (m_Nodes[i].Timer > diff)
m_Nodes[i].Timer -= diff;
else
EventPlayerDestroyedPoint(i);
EventPlayerDestroyedPoint(i);
}
}
}
Expand Down Expand Up @@ -477,9 +477,9 @@ void BattleGroundAV::ChangeMineOwner(uint8 mine, uint32 team)
bool BattleGroundAV::PlayerCanDoMineQuest(int32 GOId, uint32 team)
{
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)
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
}

Expand Down
2 changes: 1 addition & 1 deletion src/game/Chat.cpp
Expand Up @@ -2239,7 +2239,7 @@ uint32 ChatHandler::extractAccountId(char* args, std::string* accountName /*= NU

if (accountName)
sAccountMgr.GetName(account_id, *accountName);

if (targetIfNullArg)
*targetIfNullArg = targetPlayer;

Expand Down
2 changes: 1 addition & 1 deletion src/game/DBCStructure.h
Expand Up @@ -337,7 +337,7 @@ struct AchievementCriteriaEntry
uint32 rollValue; // 3
uint32 count; // 4
} roll_need_on_loot;
// ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT = 51
// ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT = 51
struct
{
uint32 rollValue; // 3
Expand Down
2 changes: 1 addition & 1 deletion src/game/Level3.cpp
Expand Up @@ -961,7 +961,7 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char* args)
uint32 targetAccountId = extractAccountId((char*)args, &account_name);
if (!targetAccountId)
return false;

char *szPassword1 = strtok (NULL," ");
char *szPassword2 = strtok (NULL," ");
if (!szPassword1 || !szPassword2)
Expand Down
8 changes: 4 additions & 4 deletions src/game/Map.cpp
Expand Up @@ -1560,13 +1560,13 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R
int delta = int((liquid_level - z) * 10);

// Get position delta
if (delta > 20) // Under water
if (delta > 20) // Under water
return LIQUID_MAP_UNDER_WATER;
if (delta > 0 ) // In water
if (delta > 0 ) // In water
return LIQUID_MAP_IN_WATER;
if (delta > -1) // Walk on water
if (delta > -1) // Walk on water
return LIQUID_MAP_WATER_WALK;
// Above water
// Above water
return LIQUID_MAP_ABOVE_WATER;
}

Expand Down
2 changes: 1 addition & 1 deletion src/game/MiscHandler.cpp
Expand Up @@ -1312,7 +1312,7 @@ void WorldSession::HandleSetTitleOpcode( WorldPacket & recv_data )
// -1 at none
if(title > 0 && title < MAX_TITLE_INDEX)
{
if(!GetPlayer()->HasTitle(title))
if(!GetPlayer()->HasTitle(title))
return;
}
else
Expand Down
4 changes: 2 additions & 2 deletions src/game/MotionMaster.cpp
Expand Up @@ -421,15 +421,15 @@ void MotionMaster::propagateSpeedChange()
MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
{
if(empty())
return IDLE_MOTION_TYPE;
return IDLE_MOTION_TYPE;

return top()->GetMovementGeneratorType();
}

bool MotionMaster::GetDestination(float &x, float &y, float &z)
{
if(empty())
return false;
return false;

return top()->GetDestination(x,y,z);
}
Expand Down
2 changes: 1 addition & 1 deletion src/game/Pet.cpp
Expand Up @@ -466,7 +466,7 @@ void Pet::setDeathState(DeathState s) // overwrite virtual
SetUInt32Value( UNIT_DYNAMIC_FLAGS, 0x00 );
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());
if(!mapEntry || (mapEntry->map_type != MAP_ARENA && mapEntry->map_type != MAP_BATTLEGROUND))
ModifyPower(POWER_HAPPINESS, -HAPPINESS_LEVEL_SIZE);
Expand Down
4 changes: 2 additions & 2 deletions src/game/RandomMovementGenerator.cpp
Expand Up @@ -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))
{
creature.AddSplineFlag(SPLINEFLAG_WALKMODE);
_setRandomLocation(creature);
creature.AddSplineFlag(SPLINEFLAG_WALKMODE);
_setRandomLocation(creature);
}
}
return true;
Expand Down
4 changes: 2 additions & 2 deletions src/game/Spell.cpp
Expand Up @@ -5258,8 +5258,8 @@ SpellCastResult Spell::CheckCasterAuras() const
{
if(!(*itr)->isAffectedOnSpell(m_spellInfo))
{
prevented_reason = SPELL_FAILED_CASTER_AURASTATE;
break;
prevented_reason = SPELL_FAILED_CASTER_AURASTATE;
break;
}
}
}
Expand Down
24 changes: 12 additions & 12 deletions src/game/SpellAuras.cpp
Expand Up @@ -3998,7 +3998,7 @@ void Aura::HandleModStealth(bool apply, bool Real)
if (apply)
{
// 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
if (Real)
Expand Down Expand Up @@ -4082,7 +4082,7 @@ void Aura::HandleInvisibility(bool apply, bool Real)
{
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)
{
Expand Down Expand Up @@ -5001,7 +5001,7 @@ void Aura::HandlePeriodicDamagePCT(bool apply, bool /*Real*/)
void Aura::HandlePeriodicLeech(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;

// For prevent double apply bonuses
bool loading = (m_target->GetTypeId() == TYPEID_PLAYER && ((Player*)m_target)->GetSession()->PlayerLoading());

Expand Down Expand Up @@ -6898,7 +6898,7 @@ void Aura::HandleSchoolAbsorb(bool apply, bool Real)
//Borrowed Time
Unit::AuraList const& borrowedTime = caster->GetAurasByType(SPELL_AURA_DUMMY);
for(Unit::AuraList::const_iterator itr = borrowedTime.begin(); itr != borrowedTime.end(); ++itr)
{
{
SpellEntry const* i_spell = (*itr)->GetSpellProto();
if(i_spell->SpellFamilyName==SPELLFAMILY_PRIEST && i_spell->SpellIconID == 2899 && i_spell->EffectMiscValue[(*itr)->GetEffIndex()] == 24)
{
Expand Down Expand Up @@ -7082,7 +7082,7 @@ void Aura::PeriodicTick()
else
pdamage = uint32(m_target->GetMaxHealth()*amount/100);


// SpellDamageBonus for magic spells
if(GetSpellProto()->DmgClass == SPELL_DAMAGE_CLASS_NONE || GetSpellProto()->DmgClass == SPELL_DAMAGE_CLASS_MAGIC)
pdamage = m_target->SpellDamageBonusTaken(pCaster, GetSpellProto(), pdamage, DOT, GetStackAmount());
Expand Down Expand Up @@ -8304,19 +8304,19 @@ void Aura::HandleAuraModAllCritChance(bool apply, bool Real)
void Aura::HandleAllowOnlyAbility(bool apply, bool Real)
{
if(!Real)
return;
return;

if(apply)
{
m_target->setAttackTimer(BASE_ATTACK,m_duration);
m_target->setAttackTimer(RANGED_ATTACK,m_duration);
m_target->setAttackTimer(OFF_ATTACK,m_duration);
m_target->setAttackTimer(BASE_ATTACK,m_duration);
m_target->setAttackTimer(RANGED_ATTACK,m_duration);
m_target->setAttackTimer(OFF_ATTACK,m_duration);
}
else
{
m_target->resetAttackTimer(BASE_ATTACK);
m_target->resetAttackTimer(RANGED_ATTACK);
m_target->resetAttackTimer(OFF_ATTACK);
m_target->resetAttackTimer(BASE_ATTACK);
m_target->resetAttackTimer(RANGED_ATTACK);
m_target->resetAttackTimer(OFF_ATTACK);
}

m_target->UpdateDamagePhysical(BASE_ATTACK);
Expand Down
16 changes: 8 additions & 8 deletions src/game/SpellEffects.cpp
Expand Up @@ -663,7 +663,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
if (m_spellInfo->SpellIconID == 1578)
{
if (m_caster->HasAura(57627)) // Charge 6 sec post-affect
damage *= 2;
damage *= 2;
}
// Mongoose Bite
else if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x000000002)) && m_spellInfo->SpellVisual[0]==342)
Expand Down Expand Up @@ -2300,8 +2300,8 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
((*itr)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000200000)) &&
(*itr)->GetCastItemGUID() == item->GetGUID())
{
m_damage += m_damage * damage / 100;
return;
m_damage += m_damage * damage / 100;
return;
}
}
}
Expand Down Expand Up @@ -3781,7 +3781,7 @@ void Spell::EffectSummonType(SpellEffectIndex eff_idx)
case SUMMON_PROP_TYPE_DK:
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)
DoSummonTotem(eff_idx);
if(prop_id == 832) // scrapbot
Expand Down Expand Up @@ -6962,13 +6962,13 @@ void Spell::DoSummonCritter(SpellEffectIndex eff_idx, uint32 forceFaction)
// If dest location if present
if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
{
x = m_targets.m_destX;
y = m_targets.m_destY;
z = m_targets.m_destZ;
x = m_targets.m_destX;
y = m_targets.m_destY;
z = m_targets.m_destZ;
}
// Summon if dest location not present near caster
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->SetSummonPoint(x, y, z, m_caster->GetOrientation());
Expand Down
2 changes: 1 addition & 1 deletion src/game/Transports.cpp
Expand Up @@ -90,7 +90,7 @@ void MapManager::LoadTransports()
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;

// creates the Gameobject
// creates the Gameobject
if(!t->Create(entry, mapid, x, y, z, o, 100, 0))
{
delete t;
Expand Down

0 comments on commit fd5bd09

Please sign in to comment.