josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: Minor code cleanup and code style fix

Browse Source
This commit is contained in:
tobmaps
2011-08-20 04:43:01 +07:00
parent e1e91bacbe
commit cd03dadb7f
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+3 -3
View File
@@ -14213,7 +14213,7 @@ void Player::OnGossipSelect(WorldObject* source, uint32 gossipListId, uint32 men
break;
case GOSSIP_OPTION_SPIRITHEALER:
if (isDead())
source->ToCreature()->CastSpell((source->ToCreature()), 17251, true, NULL, NULL, GetGUID());
source->ToCreature()->CastSpell(source->ToCreature(), 17251, true, NULL, NULL, GetGUID());
break;
case GOSSIP_OPTION_QUESTGIVER:
PrepareQuestMenu(guid);
@@ -14250,7 +14250,7 @@ void Player::OnGossipSelect(WorldObject* source, uint32 gossipListId, uint32 men
ResetPetTalents();
break;
case GOSSIP_OPTION_TAXIVENDOR:
GetSession()->SendTaxiMenu((source->ToCreature()));
GetSession()->SendTaxiMenu(source->ToCreature());
break;
case GOSSIP_OPTION_INNKEEPER:
PlayerTalkClass->SendCloseGossip();
@@ -14268,7 +14268,7 @@ void Player::OnGossipSelect(WorldObject* source, uint32 gossipListId, uint32 men
GetSession()->SendTabardVendorActivate(guid);
break;
case GOSSIP_OPTION_AUCTIONEER:
GetSession()->SendAuctionHello(guid, (source->ToCreature()));
GetSession()->SendAuctionHello(guid, source->ToCreature());
break;
case GOSSIP_OPTION_SPIRITGUIDE:
PrepareGossipMenu(source);
src/server/game/Spells/SpellEffects.cpp
+1 -1
View File
@@ -3139,7 +3139,7 @@ void Spell::EffectDispel(SpellEffIndex effIndex)
if (aura->IsPassive())
continue;
if ((aura->GetSpellInfo()->GetDispelMask()) & dispelMask)
if (aura->GetSpellInfo()->GetDispelMask() & dispelMask)
{
if (aura->GetSpellInfo()->Dispel == DISPEL_MAGIC)
{
src/server/game/Spells/SpellInfo.cpp
+6 -6
View File
@@ -423,17 +423,17 @@ bool SpellEffectInfo::IsAreaAuraEffect() const
bool SpellEffectInfo::IsFarUnitTargetEffect() const
{
return (Effect == SPELL_EFFECT_SUMMON_PLAYER);
return Effect == SPELL_EFFECT_SUMMON_PLAYER;
}
bool SpellEffectInfo::IsFarDestTargetEffect() const
{
return (Effect == SPELL_EFFECT_TELEPORT_UNITS);
return Effect == SPELL_EFFECT_TELEPORT_UNITS;
}
bool SpellEffectInfo::IsUnitOwnedAuraEffect() const
{
return (IsAreaAuraEffect() || Effect == SPELL_EFFECT_APPLY_AURA);
return IsAreaAuraEffect() || Effect == SPELL_EFFECT_APPLY_AURA;
}
int32 SpellEffectInfo::CalcValue(Unit const* caster, int32 const* bp, Unit const* /*target*/) const
@@ -1616,10 +1616,10 @@ uint32 SpellInfo::GetAllEffectsMechanicMask() const
{
uint32 mask = 0;
if (Mechanic)
mask |= 1<< Mechanic;
mask |= 1 << Mechanic;
for (int i = 0; i < MAX_SPELL_EFFECTS; ++i)
if (Effects[i].Mechanic)
mask |= 1<< Effects[i].Mechanic;
mask |= 1 << Effects[i].Mechanic;
return mask;
}
@@ -1644,7 +1644,7 @@ Mechanics SpellInfo::GetEffectMechanic(uint8 effIndex) const
uint32 SpellInfo::GetDispelMask() const
{
return SpellInfo::GetDispelMask(DispelType(Dispel));
return GetDispelMask(DispelType(Dispel));
}
uint32 SpellInfo::GetDispelMask(DispelType type)