Cosmetic: Replace "* )" with "*)" and "* /*" with "* /*"
This commit is contained in:
@@ -147,7 +147,7 @@ typedef struct AuthHandler
|
|||||||
class PatcherRunnable: public ACE_Based::Runnable
|
class PatcherRunnable: public ACE_Based::Runnable
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PatcherRunnable(class AuthSocket* );
|
PatcherRunnable(class AuthSocket*);
|
||||||
void run();
|
void run();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ class CreatureAI : public UnitAI
|
|||||||
|
|
||||||
// Called when creature attack expected (if creature can and no have current victim)
|
// Called when creature attack expected (if creature can and no have current victim)
|
||||||
// Note: for reaction at hostile action must be called AttackedBy function.
|
// Note: for reaction at hostile action must be called AttackedBy function.
|
||||||
//virtual void AttackStart(Unit* ) {}
|
//virtual void AttackStart(Unit*) {}
|
||||||
|
|
||||||
// Called at World update tick
|
// Called at World update tick
|
||||||
//virtual void UpdateAI(const uint32 /*diff*/) {}
|
//virtual void UpdateAI(const uint32 /*diff*/) {}
|
||||||
@@ -150,7 +150,7 @@ class CreatureAI : public UnitAI
|
|||||||
/// == State checks =================================
|
/// == State checks =================================
|
||||||
|
|
||||||
// Is unit visible for MoveInLineOfSight
|
// Is unit visible for MoveInLineOfSight
|
||||||
//virtual bool IsVisible(Unit* ) const { return false; }
|
//virtual bool IsVisible(Unit*) const { return false; }
|
||||||
|
|
||||||
// called when the corpse of this creature gets removed
|
// called when the corpse of this creature gets removed
|
||||||
virtual void CorpseRemoved(uint32& /*respawnDelay*/) {}
|
virtual void CorpseRemoved(uint32& /*respawnDelay*/) {}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ Bag::Bag(): Item()
|
|||||||
|
|
||||||
m_valuesCount = CONTAINER_END;
|
m_valuesCount = CONTAINER_END;
|
||||||
|
|
||||||
memset(m_bagslot, 0, sizeof(Item* ) * MAX_BAG_SIZE);
|
memset(m_bagslot, 0, sizeof(Item*) * MAX_BAG_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
Bag::~Bag()
|
Bag::~Bag()
|
||||||
|
|||||||
@@ -414,14 +414,14 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
|
|||||||
*data << (float)0;
|
*data << (float)0;
|
||||||
*data << (float)0;
|
*data << (float)0;
|
||||||
*data << (float)0;
|
*data << (float)0;
|
||||||
*data << ((WorldObject* )this)->GetOrientation();
|
*data << ((WorldObject*)this)->GetOrientation();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
*data << ((WorldObject* )this)->GetPositionX();
|
*data << ((WorldObject*)this)->GetPositionX();
|
||||||
*data << ((WorldObject* )this)->GetPositionY();
|
*data << ((WorldObject*)this)->GetPositionY();
|
||||||
*data << ((WorldObject* )this)->GetPositionZ();
|
*data << ((WorldObject*)this)->GetPositionZ();
|
||||||
*data << ((WorldObject* )this)->GetOrientation();
|
*data << ((WorldObject*)this)->GetOrientation();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2176,10 +2176,10 @@ void Map::RemoveFromActive(Creature* c)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template void Map::Add(Corpse* );
|
template void Map::Add(Corpse*);
|
||||||
template void Map::Add(Creature* );
|
template void Map::Add(Creature*);
|
||||||
template void Map::Add(GameObject* );
|
template void Map::Add(GameObject*);
|
||||||
template void Map::Add(DynamicObject* );
|
template void Map::Add(DynamicObject*);
|
||||||
|
|
||||||
template void Map::Remove(Corpse* , bool);
|
template void Map::Remove(Corpse* , bool);
|
||||||
template void Map::Remove(Creature* , bool);
|
template void Map::Remove(Creature* , bool);
|
||||||
|
|||||||
@@ -254,7 +254,7 @@ class Map : public GridRefManager<NGridType>
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool Add(Player* );
|
virtual bool Add(Player*);
|
||||||
virtual void Remove(Player* , bool);
|
virtual void Remove(Player* , bool);
|
||||||
template<class T> void Add(T *);
|
template<class T> void Add(T *);
|
||||||
template<class T> void Remove(T *, bool);
|
template<class T> void Remove(T *, bool);
|
||||||
@@ -577,7 +577,7 @@ class InstanceMap : public Map
|
|||||||
public:
|
public:
|
||||||
InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent);
|
InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent);
|
||||||
~InstanceMap();
|
~InstanceMap();
|
||||||
bool Add(Player* );
|
bool Add(Player*);
|
||||||
void Remove(Player* , bool);
|
void Remove(Player* , bool);
|
||||||
void Update(const uint32);
|
void Update(const uint32);
|
||||||
void CreateInstanceData(bool load);
|
void CreateInstanceData(bool load);
|
||||||
@@ -607,7 +607,7 @@ class BattlegroundMap : public Map
|
|||||||
BattlegroundMap(uint32 id, time_t, uint32 InstanceId, Map* _parent, uint8 spawnMode);
|
BattlegroundMap(uint32 id, time_t, uint32 InstanceId, Map* _parent, uint8 spawnMode);
|
||||||
~BattlegroundMap();
|
~BattlegroundMap();
|
||||||
|
|
||||||
bool Add(Player* );
|
bool Add(Player*);
|
||||||
void Remove(Player* , bool);
|
void Remove(Player* , bool);
|
||||||
bool CanEnter(Player* player);
|
bool CanEnter(Player* player);
|
||||||
void SetUnload();
|
void SetUnload();
|
||||||
|
|||||||
@@ -343,7 +343,7 @@ uint32 MapManager::GetNumInstances()
|
|||||||
Map* map = itr->second;
|
Map* map = itr->second;
|
||||||
if (!map->Instanceable())
|
if (!map->Instanceable())
|
||||||
continue;
|
continue;
|
||||||
MapInstanced::InstancedMaps &maps = ((MapInstanced* )map)->GetInstancedMaps();
|
MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps();
|
||||||
for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr)
|
for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr)
|
||||||
if (mitr->second->IsDungeon()) ret++;
|
if (mitr->second->IsDungeon()) ret++;
|
||||||
}
|
}
|
||||||
@@ -360,7 +360,7 @@ uint32 MapManager::GetNumPlayersInInstances()
|
|||||||
Map* map = itr->second;
|
Map* map = itr->second;
|
||||||
if (!map->Instanceable())
|
if (!map->Instanceable())
|
||||||
continue;
|
continue;
|
||||||
MapInstanced::InstancedMaps &maps = ((MapInstanced* )map)->GetInstancedMaps();
|
MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps();
|
||||||
for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr)
|
for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr)
|
||||||
if (mitr->second->IsDungeon())
|
if (mitr->second->IsDungeon())
|
||||||
ret += ((InstanceMap*)mitr->second)->GetPlayers().getSize();
|
ret += ((InstanceMap*)mitr->second)->GetPlayers().getSize();
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ class OutdoorPvP : public ZoneScript
|
|||||||
|
|
||||||
void OnGameObjectCreate(GameObject* go);
|
void OnGameObjectCreate(GameObject* go);
|
||||||
void OnGameObjectRemove(GameObject* go);
|
void OnGameObjectRemove(GameObject* go);
|
||||||
void OnCreatureCreate(Creature* ) {}
|
void OnCreatureCreate(Creature*) {}
|
||||||
|
|
||||||
// send world state update to all players present
|
// send world state update to all players present
|
||||||
void SendUpdateWorldState(uint32 field, uint32 value);
|
void SendUpdateWorldState(uint32 field, uint32 value);
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ public:
|
|||||||
explicit PacketFilter(WorldSession* pSession) : m_pSession(pSession) {}
|
explicit PacketFilter(WorldSession* pSession) : m_pSession(pSession) {}
|
||||||
virtual ~PacketFilter() {}
|
virtual ~PacketFilter() {}
|
||||||
|
|
||||||
virtual bool Process(WorldPacket* /*packet*/) { return true; }
|
virtual bool Process(WorldPacket* /*packet*/) { return true; }
|
||||||
virtual bool ProcessLogout() const { return true; }
|
virtual bool ProcessLogout() const { return true; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@@ -5653,7 +5653,7 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const
|
|||||||
// Mirror Image
|
// Mirror Image
|
||||||
if (GetId() == 55342)
|
if (GetId() == 55342)
|
||||||
// Set name of summons to name of caster
|
// Set name of summons to name of caster
|
||||||
target->CastSpell((Unit* )NULL, m_spellInfo->Effects[m_effIndex].TriggerSpell, true);
|
target->CastSpell((Unit*)NULL, m_spellInfo->Effects[m_effIndex].TriggerSpell, true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SPELLFAMILY_WARLOCK:
|
case SPELLFAMILY_WARLOCK:
|
||||||
|
|||||||
@@ -375,8 +375,8 @@ class AuraScript : public _SpellScript
|
|||||||
#define AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \
|
#define AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \
|
||||||
typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit* target); \
|
typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit* target); \
|
||||||
typedef void(CLASSNAME::*AuraEffectApplicationModeFnType)(AuraEffect const* , AuraEffectHandleModes); \
|
typedef void(CLASSNAME::*AuraEffectApplicationModeFnType)(AuraEffect const* , AuraEffectHandleModes); \
|
||||||
typedef void(CLASSNAME::*AuraEffectPeriodicFnType)(AuraEffect const* ); \
|
typedef void(CLASSNAME::*AuraEffectPeriodicFnType)(AuraEffect const*); \
|
||||||
typedef void(CLASSNAME::*AuraEffectUpdatePeriodicFnType)(AuraEffect* ); \
|
typedef void(CLASSNAME::*AuraEffectUpdatePeriodicFnType)(AuraEffect*); \
|
||||||
typedef void(CLASSNAME::*AuraEffectCalcAmountFnType)(AuraEffect const* , int32 &, bool &); \
|
typedef void(CLASSNAME::*AuraEffectCalcAmountFnType)(AuraEffect const* , int32 &, bool &); \
|
||||||
typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const* , bool &, int32 &); \
|
typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const* , bool &, int32 &); \
|
||||||
typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const* , SpellModifier* &); \
|
typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const* , SpellModifier* &); \
|
||||||
|
|||||||
@@ -441,12 +441,12 @@ public:
|
|||||||
else if (target->ToCreature()->isPet())
|
else if (target->ToCreature()->isPet())
|
||||||
{
|
{
|
||||||
Unit* owner = target->GetOwner();
|
Unit* owner = target->GetOwner();
|
||||||
if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet* )target)->IsPermanentPetFor(owner->ToPlayer()))
|
if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet*)target)->IsPermanentPetFor(owner->ToPlayer()))
|
||||||
{
|
{
|
||||||
// check online security
|
// check online security
|
||||||
if (handler->HasLowerSecurity(owner->ToPlayer(), 0))
|
if (handler->HasLowerSecurity(owner->ToPlayer(), 0))
|
||||||
return false;
|
return false;
|
||||||
((Pet* )target)->SetFreeTalentPoints(tp);
|
((Pet*)target)->SetFreeTalentPoints(tp);
|
||||||
owner->ToPlayer()->SendTalentsInfoData(true);
|
owner->ToPlayer()->SendTalentsInfoData(true);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ class at_ring_of_law : public AreaTriggerScript
|
|||||||
public:
|
public:
|
||||||
at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { }
|
at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { }
|
||||||
|
|
||||||
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
||||||
{
|
{
|
||||||
if (InstanceScript* pInstance = player->GetInstanceScript())
|
if (InstanceScript* pInstance = player->GetInstanceScript())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class at_malfurion_stormrage : public AreaTriggerScript
|
|||||||
public:
|
public:
|
||||||
at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { }
|
at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { }
|
||||||
|
|
||||||
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
||||||
{
|
{
|
||||||
if (player->GetInstanceScript() && !player->FindNearestCreature(15362, 15))
|
if (player->GetInstanceScript() && !player->FindNearestCreature(15362, 15))
|
||||||
player->SummonCreature(15362, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000);
|
player->SummonCreature(15362, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000);
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ class at_twilight_grove : public AreaTriggerScript
|
|||||||
public:
|
public:
|
||||||
at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { }
|
at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { }
|
||||||
|
|
||||||
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
||||||
{
|
{
|
||||||
if (player->HasQuestForItem(21149))
|
if (player->HasQuestForItem(21149))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -443,7 +443,7 @@ class at_zumrah : public AreaTriggerScript
|
|||||||
public:
|
public:
|
||||||
at_zumrah() : AreaTriggerScript("at_zumrah") { }
|
at_zumrah() : AreaTriggerScript("at_zumrah") { }
|
||||||
|
|
||||||
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
||||||
{
|
{
|
||||||
Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f);
|
Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f);
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -64,7 +64,7 @@ public:
|
|||||||
{
|
{
|
||||||
boss_toc_champion_controllerAI(Creature* creature) : ScriptedAI(creature), Summons(me)
|
boss_toc_champion_controllerAI(Creature* creature) : ScriptedAI(creature), Summons(me)
|
||||||
{
|
{
|
||||||
m_pInstance = (InstanceScript* ) creature->GetInstanceScript();
|
m_pInstance = (InstanceScript*) creature->GetInstanceScript();
|
||||||
}
|
}
|
||||||
|
|
||||||
InstanceScript* m_pInstance;
|
InstanceScript* m_pInstance;
|
||||||
@@ -253,7 +253,7 @@ struct boss_faction_championsAI : public ScriptedAI
|
|||||||
{
|
{
|
||||||
boss_faction_championsAI(Creature* creature, uint32 aitype) : ScriptedAI(creature)
|
boss_faction_championsAI(Creature* creature, uint32 aitype) : ScriptedAI(creature)
|
||||||
{
|
{
|
||||||
m_pInstance = (InstanceScript* ) creature->GetInstanceScript();
|
m_pInstance = (InstanceScript*) creature->GetInstanceScript();
|
||||||
mAIType = aitype;
|
mAIType = aitype;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -757,7 +757,7 @@ class spell_powering_up : public SpellScriptLoader
|
|||||||
|
|
||||||
uint32 spellId;
|
uint32 spellId;
|
||||||
|
|
||||||
bool Validate(SpellEntry const* /*spellEntry*/)
|
bool Validate(SpellEntry const* /*spellEntry*/)
|
||||||
{
|
{
|
||||||
spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster());
|
spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster());
|
||||||
if (!sSpellMgr->GetSpellInfo(spellId))
|
if (!sSpellMgr->GetSpellInfo(spellId))
|
||||||
@@ -803,7 +803,7 @@ class spell_valkyr_essences : public SpellScriptLoader
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & /*absorbAmount*/)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & /*absorbAmount*/)
|
||||||
{
|
{
|
||||||
if (urand(0, 99) < 5)
|
if (urand(0, 99) < 5)
|
||||||
GetTarget()->CastSpell(GetTarget(), spellId, true);
|
GetTarget()->CastSpell(GetTarget(), spellId, true);
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ public:
|
|||||||
DoScriptText(SAY_SLAY, me);
|
DoScriptText(SAY_SLAY, me);
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* )
|
void JustDied(Unit*)
|
||||||
{
|
{
|
||||||
_JustDied();
|
_JustDied();
|
||||||
|
|
||||||
|
|||||||
@@ -658,7 +658,7 @@ class at_kelthuzad_center : public AreaTriggerScript
|
|||||||
public:
|
public:
|
||||||
at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { }
|
at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { }
|
||||||
|
|
||||||
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
||||||
{
|
{
|
||||||
if (player->isGameMaster())
|
if (player->isGameMaster())
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -545,7 +545,7 @@ public:
|
|||||||
ScriptedAI::AttackStart(who);
|
ScriptedAI::AttackStart(who);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MoveInLineOfSight(Unit* ) {}
|
void MoveInLineOfSight(Unit*) {}
|
||||||
|
|
||||||
void JustDied(Unit* /*killer*/)
|
void JustDied(Unit* /*killer*/)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -640,7 +640,7 @@ class at_commander_dawnforge : public AreaTriggerScript
|
|||||||
public:
|
public:
|
||||||
at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { }
|
at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { }
|
||||||
|
|
||||||
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
|
||||||
{
|
{
|
||||||
//if player lost aura or not have at all, we should not try start event.
|
//if player lost aura or not have at all, we should not try start event.
|
||||||
if (!player->HasAura(SPELL_SUNFURY_DISGUISE))
|
if (!player->HasAura(SPELL_SUNFURY_DISGUISE))
|
||||||
@@ -782,7 +782,7 @@ public:
|
|||||||
PlayerGUID = who->GetGUID();
|
PlayerGUID = who->GetGUID();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/)
|
void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/)
|
||||||
{
|
{
|
||||||
DoCast(me, SPELL_DE_MATERIALIZE);
|
DoCast(me, SPELL_DE_MATERIALIZE);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct);
|
absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct);
|
||||||
}
|
}
|
||||||
@@ -112,7 +112,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
absorbAmount = std::min(CalculatePctN(dmgInfo.GetDamage(), absorbPct), GetTarget()->CountPctFromMaxHealth(hpPct));
|
absorbAmount = std::min(CalculatePctN(dmgInfo.GetDamage(), absorbPct), GetTarget()->CountPctFromMaxHealth(hpPct));
|
||||||
}
|
}
|
||||||
@@ -174,7 +174,7 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader
|
|||||||
amount += int32(2 * player->GetTotalAttackPowerValue(BASE_ATTACK));
|
amount += int32(2 * player->GetTotalAttackPowerValue(BASE_ATTACK));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct);
|
absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct);
|
||||||
}
|
}
|
||||||
@@ -429,7 +429,7 @@ class spell_dk_spell_deflection : public SpellScriptLoader
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
// You have a chance equal to your Parry chance
|
// You have a chance equal to your Parry chance
|
||||||
if ((dmgInfo.GetDamageType() == SPELL_DIRECT_DAMAGE) && roll_chance_f(GetTarget()->GetUnitParryChance()))
|
if ((dmgInfo.GetDamageType() == SPELL_DIRECT_DAMAGE) && roll_chance_f(GetTarget()->GetUnitParryChance()))
|
||||||
@@ -532,7 +532,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
// min pct of hp is stored in effect 0 of talent spell
|
// min pct of hp is stored in effect 0 of talent spell
|
||||||
uint32 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id);
|
uint32 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id);
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
// reduces all damage taken while Stunned in Moonkin Form
|
// reduces all damage taken while Stunned in Moonkin Form
|
||||||
if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN))
|
if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN))
|
||||||
@@ -152,7 +152,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
// reduces all damage taken while Stunned in Cat Form
|
// reduces all damage taken while Stunned in Cat Form
|
||||||
if (GetTarget()->GetShapeshiftForm() == FORM_CAT && GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN))
|
if (GetTarget()->GetShapeshiftForm() == FORM_CAT && GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN))
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
Unit* target = GetTarget();
|
Unit* target = GetTarget();
|
||||||
if (dmgInfo.GetDamage() < target->GetHealth())
|
if (dmgInfo.GetDamage() < target->GetHealth())
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public:
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
Unit* target = GetTarget();
|
Unit* target = GetTarget();
|
||||||
if (dmgInfo.GetDamage() < target->GetHealth())
|
if (dmgInfo.GetDamage() < target->GetHealth())
|
||||||
@@ -125,7 +125,7 @@ public:
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
// reduces all damage taken while stun or fear
|
// reduces all damage taken while stun or fear
|
||||||
if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_FLEEING) || (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN)))
|
if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_FLEEING) || (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN)))
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ class spell_sha_astral_shift : public SpellScriptLoader
|
|||||||
amount = -1;
|
amount = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||||
{
|
{
|
||||||
// reduces all damage taken while stun, fear or silence
|
// reduces all damage taken while stun, fear or silence
|
||||||
if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_FLEEING | UNIT_FLAG_SILENCED) || (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN)))
|
if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_FLEEING | UNIT_FLAG_SILENCED) || (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN)))
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ void SHA1Hash::UpdateBigNumbers(BigNumber* bn0, ...)
|
|||||||
while (bn)
|
while (bn)
|
||||||
{
|
{
|
||||||
UpdateData(bn->AsByteArray(), bn->GetNumBytes());
|
UpdateData(bn->AsByteArray(), bn->GetNumBytes());
|
||||||
bn = va_arg(v, BigNumber* );
|
bn = va_arg(v, BigNumber*);
|
||||||
}
|
}
|
||||||
va_end(v);
|
va_end(v);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,14 +72,14 @@ template <class TO, class FROM> class Reference : public LinkedListElement
|
|||||||
}
|
}
|
||||||
|
|
||||||
Reference<TO, FROM> * next() { return((Reference<TO, FROM> *) LinkedListElement::next()); }
|
Reference<TO, FROM> * next() { return((Reference<TO, FROM> *) LinkedListElement::next()); }
|
||||||
Reference<TO, FROM> const* next() const { return((Reference<TO, FROM> const* ) LinkedListElement::next()); }
|
Reference<TO, FROM> const* next() const { return((Reference<TO, FROM> const*) LinkedListElement::next()); }
|
||||||
Reference<TO, FROM> * prev() { return((Reference<TO, FROM> *) LinkedListElement::prev()); }
|
Reference<TO, FROM> * prev() { return((Reference<TO, FROM> *) LinkedListElement::prev()); }
|
||||||
Reference<TO, FROM> const* prev() const { return((Reference<TO, FROM> const* ) LinkedListElement::prev()); }
|
Reference<TO, FROM> const* prev() const { return((Reference<TO, FROM> const*) LinkedListElement::prev()); }
|
||||||
|
|
||||||
Reference<TO, FROM> * nocheck_next() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_next()); }
|
Reference<TO, FROM> * nocheck_next() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_next()); }
|
||||||
Reference<TO, FROM> const* nocheck_next() const { return((Reference<TO, FROM> const* ) LinkedListElement::nocheck_next()); }
|
Reference<TO, FROM> const* nocheck_next() const { return((Reference<TO, FROM> const*) LinkedListElement::nocheck_next()); }
|
||||||
Reference<TO, FROM> * nocheck_prev() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_prev()); }
|
Reference<TO, FROM> * nocheck_prev() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_prev()); }
|
||||||
Reference<TO, FROM> const* nocheck_prev() const { return((Reference<TO, FROM> const* ) LinkedListElement::nocheck_prev()); }
|
Reference<TO, FROM> const* nocheck_prev() const { return((Reference<TO, FROM> const*) LinkedListElement::nocheck_prev()); }
|
||||||
|
|
||||||
TO* operator ->() const { return iRefTo; }
|
TO* operator ->() const { return iRefTo; }
|
||||||
TO* getTarget() const { return iRefTo; }
|
TO* getTarget() const { return iRefTo; }
|
||||||
|
|||||||
@@ -147,14 +147,14 @@ class ByteBuffer
|
|||||||
|
|
||||||
ByteBuffer &operator<<(const std::string &value)
|
ByteBuffer &operator<<(const std::string &value)
|
||||||
{
|
{
|
||||||
append((uint8 const* )value.c_str(), value.length());
|
append((uint8 const*)value.c_str(), value.length());
|
||||||
append((uint8)0);
|
append((uint8)0);
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
ByteBuffer &operator<<(const char *str)
|
ByteBuffer &operator<<(const char *str)
|
||||||
{
|
{
|
||||||
append((uint8 const* )str, str ? strlen(str) : 0);
|
append((uint8 const*)str, str ? strlen(str) : 0);
|
||||||
append((uint8)0);
|
append((uint8)0);
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user