Buildsystem/MSVC: Warning fixes
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning) C4127 conditional expression is constant
This commit is contained in:
1 parent
345bed25d2
commit
7532864264
104 files changed
+386
-387
No files matched your search
@@ -909,7 +909,7 @@ public:
|
||||
handler->GetSession()->GetPlayer()->GetClosePoint(x, y, z, handler->GetSession()->GetPlayer()->GetObjectSize());
|
||||
|
||||
if (!i)
|
||||
return handler->GetSession()->GetPlayer()->SummonCreature(entry, x, y, z, o);
|
||||
return handler->GetSession()->GetPlayer()->SummonCreature(entry, x, y, z, o) != nullptr;
|
||||
|
||||
uint32 id = (uint32)atoi(i);
|
||||
|
||||
@@ -1108,28 +1108,28 @@ public:
|
||||
|
||||
uint64 guid = target->GetGUID();
|
||||
|
||||
uint32 opcode = (uint32)atoi(x);
|
||||
if (opcode >= target->GetValuesCount())
|
||||
uint32 field = (uint32)atoi(x);
|
||||
if (field >= target->GetValuesCount())
|
||||
{
|
||||
handler->PSendSysMessage(LANG_TOO_BIG_INDEX, opcode, GUID_LOPART(guid), target->GetValuesCount());
|
||||
handler->PSendSysMessage(LANG_TOO_BIG_INDEX, field, GUID_LOPART(guid), target->GetValuesCount());
|
||||
return false;
|
||||
}
|
||||
|
||||
bool isInt32 = true;
|
||||
if (z)
|
||||
isInt32 = (bool)atoi(z);
|
||||
isInt32 = atoi(z) != 0;
|
||||
|
||||
if (isInt32)
|
||||
{
|
||||
uint32 value = (uint32)atoi(y);
|
||||
target->SetUInt32Value(opcode, value);
|
||||
handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), opcode, value);
|
||||
target->SetUInt32Value(field, value);
|
||||
handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), field, value);
|
||||
}
|
||||
else
|
||||
{
|
||||
float value = (float)atof(y);
|
||||
target->SetFloatValue(opcode, value);
|
||||
handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), opcode, value);
|
||||
target->SetFloatValue(field, value);
|
||||
handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), field, value);
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -1165,7 +1165,7 @@ public:
|
||||
|
||||
bool isInt32 = true;
|
||||
if (z)
|
||||
isInt32 = (bool)atoi(z);
|
||||
isInt32 = atoi(z) != 0;
|
||||
|
||||
if (isInt32)
|
||||
{
|
||||
@@ -1316,15 +1316,15 @@ public:
|
||||
MOVEMENTFLAG_WALKING | MOVEMENTFLAG_SWIMMING |
|
||||
MOVEMENTFLAG_SPLINE_ENABLED;
|
||||
|
||||
bool unhandledFlag = (moveFlags ^ target->GetUnitMovementFlags()) & ~FlagsWithHandlers;
|
||||
bool unhandledFlag = ((moveFlags ^ target->GetUnitMovementFlags()) & ~FlagsWithHandlers) != 0;
|
||||
|
||||
target->SetWalk(moveFlags & MOVEMENTFLAG_WALKING);
|
||||
target->SetDisableGravity(moveFlags & MOVEMENTFLAG_DISABLE_GRAVITY);
|
||||
target->SetSwim(moveFlags & MOVEMENTFLAG_SWIMMING);
|
||||
target->SetCanFly(moveFlags & MOVEMENTFLAG_CAN_FLY);
|
||||
target->SetWaterWalking(moveFlags & MOVEMENTFLAG_WATERWALKING);
|
||||
target->SetFeatherFall(moveFlags & MOVEMENTFLAG_FALLING_SLOW);
|
||||
target->SetHover(moveFlags & MOVEMENTFLAG_HOVER);
|
||||
target->SetWalk((moveFlags & MOVEMENTFLAG_WALKING) != 0);
|
||||
target->SetDisableGravity((moveFlags & MOVEMENTFLAG_DISABLE_GRAVITY) != 0);
|
||||
target->SetSwim((moveFlags & MOVEMENTFLAG_SWIMMING) != 0);
|
||||
target->SetCanFly((moveFlags & MOVEMENTFLAG_CAN_FLY) != 0);
|
||||
target->SetWaterWalking((moveFlags & MOVEMENTFLAG_WATERWALKING) != 0);
|
||||
target->SetFeatherFall((moveFlags & MOVEMENTFLAG_FALLING_SLOW) != 0);
|
||||
target->SetHover((moveFlags & MOVEMENTFLAG_HOVER) != 0);
|
||||
|
||||
if (moveFlags & (MOVEMENTFLAG_DISABLE_GRAVITY | MOVEMENTFLAG_CAN_FLY))
|
||||
moveFlags &= ~MOVEMENTFLAG_FALLING;
|
||||
|
||||
@@ -118,7 +118,7 @@ public:
|
||||
|
||||
static bool HandleLfgQueueInfoCommand(ChatHandler* handler, char const* args)
|
||||
{
|
||||
handler->SendSysMessage(sLFGMgr->DumpQueueInfo(*args).c_str());
|
||||
handler->SendSysMessage(sLFGMgr->DumpQueueInfo(atoi(args) != 0).c_str());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1341,7 +1341,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
bool targetHasSkill = target->GetSkillValue(skill);
|
||||
bool targetHasSkill = target->GetSkillValue(skill) != 0;
|
||||
|
||||
// If our target does not yet have the skill they are trying to add to them, the chosen level also becomes
|
||||
// the max level of the new profession.
|
||||
|
||||
@@ -84,8 +84,8 @@ class instance_magisters_terrace : public InstanceMapScript
|
||||
DelrissaDeathCount = 0;
|
||||
break;
|
||||
case DATA_KAELTHAS_STATUES:
|
||||
HandleGameObject(KaelStatue[0], data);
|
||||
HandleGameObject(KaelStatue[1], data);
|
||||
HandleGameObject(KaelStatue[0], data != 0);
|
||||
HandleGameObject(KaelStatue[1], data != 0);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
@@ -1171,7 +1171,7 @@ public:
|
||||
c = 0;
|
||||
mx = ShieldOrbLocations[0][0];
|
||||
my = ShieldOrbLocations[0][1];
|
||||
bClockwise = urand(0, 1);
|
||||
bClockwise = roll_chance_i(50);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff) override
|
||||
|
||||
@@ -192,7 +192,7 @@ struct dummy_dragonAI : public ScriptedAI
|
||||
void SetData(uint32 type, uint32 value) override
|
||||
{
|
||||
if (type == DATA_CAN_LOOT)
|
||||
_canLoot = value;
|
||||
_canLoot = value != 0;
|
||||
}
|
||||
|
||||
void MovementInform(uint32 type, uint32 pointId) override
|
||||
|
||||
+1
-1
@@ -674,7 +674,7 @@ public:
|
||||
|
||||
if (uiHealingWaveTimer <= uiDiff)
|
||||
{
|
||||
bool bChance = urand(0, 1);
|
||||
bool bChance = roll_chance_i(50);
|
||||
|
||||
if (!bChance)
|
||||
{
|
||||
|
||||
@@ -1316,7 +1316,7 @@ class npc_the_lich_king_escape_hor : public CreatureScript
|
||||
{
|
||||
if (Unit* victim = me->SelectVictim())
|
||||
AttackStart(victim);
|
||||
return me->GetVictim();
|
||||
return me->GetVictim() != nullptr;
|
||||
}
|
||||
else if (me->getThreatManager().getThreatList().size() < 2 && me->HasAura(SPELL_REMORSELESS_WINTER))
|
||||
{
|
||||
|
||||
@@ -205,7 +205,7 @@ class boss_drakkari_colossus : public CreatureScript
|
||||
void SetData(uint32 type, uint32 data) override
|
||||
{
|
||||
if (type == DATA_INTRO_DONE)
|
||||
introDone = data;
|
||||
introDone = data != 0;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff) override
|
||||
|
||||
@@ -201,7 +201,7 @@ public:
|
||||
|
||||
bool WasWrapped(uint64 guid)
|
||||
{
|
||||
return lWrappedPlayers.count(guid);
|
||||
return lWrappedPlayers.count(guid) != 0;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -626,7 +626,8 @@ protected:
|
||||
{
|
||||
if (Unit* victim = me->SelectVictim())
|
||||
AttackStart(victim);
|
||||
return me->GetVictim();
|
||||
|
||||
return me->GetVictim() != nullptr;
|
||||
}
|
||||
else if (me->getThreatManager().isThreatListEmpty())
|
||||
{
|
||||
@@ -1872,7 +1873,7 @@ class spell_igb_rocket_pack_useable : public SpellScriptLoader
|
||||
|
||||
bool Load()
|
||||
{
|
||||
return GetOwner()->GetInstanceScript();
|
||||
return GetOwner()->GetInstanceScript() != nullptr;
|
||||
}
|
||||
|
||||
bool CheckAreaTarget(Unit* target)
|
||||
@@ -2328,7 +2329,7 @@ class spell_igb_gunship_fall_teleport : public SpellScriptLoader
|
||||
|
||||
bool Load()
|
||||
{
|
||||
return GetCaster()->GetInstanceScript();
|
||||
return GetCaster()->GetInstanceScript() != nullptr;
|
||||
}
|
||||
|
||||
void SelectTransport(WorldObject*& target)
|
||||
@@ -2417,7 +2418,7 @@ class spell_igb_teleport_players_on_victory : public SpellScriptLoader
|
||||
|
||||
bool Load() override
|
||||
{
|
||||
return GetCaster()->GetInstanceScript();
|
||||
return GetCaster()->GetInstanceScript() != nullptr;
|
||||
}
|
||||
|
||||
void FilterTargets(std::list<WorldObject*>& targets)
|
||||
|
||||
@@ -558,7 +558,7 @@ class boss_professor_putricide : public CreatureScript
|
||||
void SetData(uint32 id, uint32 data) override
|
||||
{
|
||||
if (id == DATA_EXPERIMENT_STAGE)
|
||||
_experimentState = bool(data);
|
||||
_experimentState = data != 0;
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff) override
|
||||
|
||||
@@ -522,7 +522,7 @@ class npc_gothik_minion : public CreatureScript
|
||||
|
||||
void DoAction(int32 param) override
|
||||
{
|
||||
gateClose = param;
|
||||
gateClose = param != 0;
|
||||
}
|
||||
|
||||
void DamageTaken(Unit* attacker, uint32 &damage) override
|
||||
|
||||
@@ -1368,7 +1368,7 @@ class achievement_unbroken : public AchievementCriteriaScript
|
||||
{
|
||||
if (target)
|
||||
if (InstanceScript* instance = target->GetInstanceScript())
|
||||
return instance->GetData(DATA_UNBROKEN);
|
||||
return instance->GetData(DATA_UNBROKEN) != 0;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -477,7 +477,7 @@ class achievement_ignis_shattered : public AchievementCriteriaScript
|
||||
bool OnCheck(Player* /*source*/, Unit* target) override
|
||||
{
|
||||
if (target && target->IsAIEnabled)
|
||||
return target->GetAI()->GetData(DATA_SHATTERED);
|
||||
return target->GetAI()->GetData(DATA_SHATTERED) != 0;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -918,7 +918,7 @@ class npc_darkrune_guardian : public CreatureScript
|
||||
void SetData(uint32 type, uint32 value) override
|
||||
{
|
||||
if (type == DATA_IRON_DWARF_MEDIUM_RARE)
|
||||
killedByBreath = value;
|
||||
killedByBreath = value != 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1066,7 +1066,7 @@ class achievement_heartbreaker : public AchievementCriteriaScript
|
||||
if (!target || !target->GetAI())
|
||||
return false;
|
||||
|
||||
return target->GetAI()->GetData(DATA_HARD_MODE);
|
||||
return target->GetAI()->GetData(DATA_HARD_MODE) != 0;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -1137,7 +1137,7 @@ class npc_ominous_cloud : public CreatureScript
|
||||
void DoAction(int32 action) override
|
||||
{
|
||||
Movement::MoveSplineInit init(me);
|
||||
FillCirclePath(YoggSaronSpawnPos, me->GetDistance2d(YoggSaronSpawnPos.GetPositionX(), YoggSaronSpawnPos.GetPositionY()), me->GetPositionZ(), init.Path(), action);
|
||||
FillCirclePath(YoggSaronSpawnPos, me->GetDistance2d(YoggSaronSpawnPos.GetPositionX(), YoggSaronSpawnPos.GetPositionY()), me->GetPositionZ(), init.Path(), action != 0);
|
||||
init.SetWalk(true);
|
||||
init.SetCyclic();
|
||||
init.Launch();
|
||||
|
||||
@@ -773,7 +773,7 @@ class instance_ulduar : public InstanceMapScript
|
||||
}
|
||||
break;
|
||||
case DATA_UNBROKEN:
|
||||
Unbroken = bool(data);
|
||||
Unbroken = data != 0;
|
||||
break;
|
||||
case DATA_ILLUSION:
|
||||
illusion = data;
|
||||
|
||||
@@ -433,7 +433,7 @@ class spell_ingvar_woe_strike : public SpellScriptLoader
|
||||
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
return eventInfo.GetHealInfo()->GetHeal();
|
||||
return eventInfo.GetHealInfo()->GetHeal() != 0;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
|
||||
@@ -157,7 +157,7 @@ class boss_keleseth : public CreatureScript
|
||||
void SetData(uint32 data, uint32 value) override
|
||||
{
|
||||
if (data == DATA_ON_THE_ROCKS)
|
||||
onTheRocks = value;
|
||||
onTheRocks = value != 0;
|
||||
}
|
||||
|
||||
uint32 GetData(uint32 data) const override
|
||||
|
||||
@@ -814,7 +814,7 @@ class spell_close_rift : public SpellScriptLoader
|
||||
|
||||
bool Validate(SpellInfo const* /*spell*/) override
|
||||
{
|
||||
return sSpellMgr->GetSpellInfo(SPELL_DESPAWN_RIFT);
|
||||
return sSpellMgr->GetSpellInfo(SPELL_DESPAWN_RIFT) != nullptr;
|
||||
}
|
||||
|
||||
void HandlePeriodic(AuraEffect const* /* aurEff */)
|
||||
|
||||
@@ -111,20 +111,20 @@ void OPvPCapturePointEP_EWT::SendChangePhase()
|
||||
|
||||
void OPvPCapturePointEP_EWT::FillInitialWorldStates(WorldPacket &data)
|
||||
{
|
||||
data << EP_EWT_A << uint32(bool(m_TowerState & EP_TS_A));
|
||||
data << EP_EWT_H << uint32(bool(m_TowerState & EP_TS_H));
|
||||
data << EP_EWT_N_A << uint32(bool(m_TowerState & EP_TS_N_A));
|
||||
data << EP_EWT_N_H << uint32(bool(m_TowerState & EP_TS_N_H));
|
||||
data << EP_EWT_N << uint32(bool(m_TowerState & EP_TS_N));
|
||||
data << EP_EWT_A << uint32((m_TowerState & EP_TS_A) != 0);
|
||||
data << EP_EWT_H << uint32((m_TowerState & EP_TS_H) != 0);
|
||||
data << EP_EWT_N_A << uint32((m_TowerState & EP_TS_N_A) != 0);
|
||||
data << EP_EWT_N_H << uint32((m_TowerState & EP_TS_N_H) != 0);
|
||||
data << EP_EWT_N << uint32((m_TowerState & EP_TS_N) != 0);
|
||||
}
|
||||
|
||||
void OPvPCapturePointEP_EWT::UpdateTowerState()
|
||||
{
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_A, bool(m_TowerState & EP_TS_A));
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_H, bool(m_TowerState & EP_TS_H));
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_N_A, bool(m_TowerState & EP_TS_N_A));
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_N_H, bool(m_TowerState & EP_TS_N_H));
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_N, bool(m_TowerState & EP_TS_N));
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_A, (m_TowerState & EP_TS_A) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_H, (m_TowerState & EP_TS_H) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_N_A, (m_TowerState & EP_TS_N_A) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_N_H, (m_TowerState & EP_TS_N_H) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_EWT_N, (m_TowerState & EP_TS_N) != 0);
|
||||
}
|
||||
|
||||
bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player* player)
|
||||
@@ -259,20 +259,20 @@ void OPvPCapturePointEP_NPT::SendChangePhase()
|
||||
|
||||
void OPvPCapturePointEP_NPT::FillInitialWorldStates(WorldPacket &data)
|
||||
{
|
||||
data << EP_NPT_A << uint32(bool(m_TowerState & EP_TS_A));
|
||||
data << EP_NPT_H << uint32(bool(m_TowerState & EP_TS_H));
|
||||
data << EP_NPT_N_A << uint32(bool(m_TowerState & EP_TS_N_A));
|
||||
data << EP_NPT_N_H << uint32(bool(m_TowerState & EP_TS_N_H));
|
||||
data << EP_NPT_N << uint32(bool(m_TowerState & EP_TS_N));
|
||||
data << EP_NPT_A << uint32((m_TowerState & EP_TS_A) != 0);
|
||||
data << EP_NPT_H << uint32((m_TowerState & EP_TS_H) != 0);
|
||||
data << EP_NPT_N_A << uint32((m_TowerState & EP_TS_N_A) != 0);
|
||||
data << EP_NPT_N_H << uint32((m_TowerState & EP_TS_N_H) != 0);
|
||||
data << EP_NPT_N << uint32((m_TowerState & EP_TS_N) != 0);
|
||||
}
|
||||
|
||||
void OPvPCapturePointEP_NPT::UpdateTowerState()
|
||||
{
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_A, bool(m_TowerState & EP_TS_A));
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_H, bool(m_TowerState & EP_TS_H));
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_N_A, bool(m_TowerState & EP_TS_N_A));
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_N_H, bool(m_TowerState & EP_TS_N_H));
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_N, bool(m_TowerState & EP_TS_N));
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_A, (m_TowerState & EP_TS_A) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_H, (m_TowerState & EP_TS_H) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_N_A, (m_TowerState & EP_TS_N_A) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_N_H, (m_TowerState & EP_TS_N_H) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_NPT_N, (m_TowerState & EP_TS_N) != 0);
|
||||
}
|
||||
|
||||
bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player* player)
|
||||
@@ -391,20 +391,20 @@ void OPvPCapturePointEP_CGT::SendChangePhase()
|
||||
|
||||
void OPvPCapturePointEP_CGT::FillInitialWorldStates(WorldPacket &data)
|
||||
{
|
||||
data << EP_CGT_A << uint32(bool(m_TowerState & EP_TS_A));
|
||||
data << EP_CGT_H << uint32(bool(m_TowerState & EP_TS_H));
|
||||
data << EP_CGT_N_A << uint32(bool(m_TowerState & EP_TS_N_A));
|
||||
data << EP_CGT_N_H << uint32(bool(m_TowerState & EP_TS_N_H));
|
||||
data << EP_CGT_N << uint32(bool(m_TowerState & EP_TS_N));
|
||||
data << EP_CGT_A << uint32((m_TowerState & EP_TS_A) != 0);
|
||||
data << EP_CGT_H << uint32((m_TowerState & EP_TS_H) != 0);
|
||||
data << EP_CGT_N_A << uint32((m_TowerState & EP_TS_N_A) != 0);
|
||||
data << EP_CGT_N_H << uint32((m_TowerState & EP_TS_N_H) != 0);
|
||||
data << EP_CGT_N << uint32((m_TowerState & EP_TS_N) != 0);
|
||||
}
|
||||
|
||||
void OPvPCapturePointEP_CGT::UpdateTowerState()
|
||||
{
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_A, bool(m_TowerState & EP_TS_A));
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_H, bool(m_TowerState & EP_TS_H));
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_N_A, bool(m_TowerState & EP_TS_N_A));
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_N_H, bool(m_TowerState & EP_TS_N_H));
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_N, bool(m_TowerState & EP_TS_N));
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_A, (m_TowerState & EP_TS_A) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_H, (m_TowerState & EP_TS_H) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_N_A, (m_TowerState & EP_TS_N_A) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_N_H, (m_TowerState & EP_TS_N_H) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_CGT_N, (m_TowerState & EP_TS_N) != 0);
|
||||
}
|
||||
|
||||
bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player* player)
|
||||
@@ -530,20 +530,20 @@ void OPvPCapturePointEP_PWT::SendChangePhase()
|
||||
|
||||
void OPvPCapturePointEP_PWT::FillInitialWorldStates(WorldPacket &data)
|
||||
{
|
||||
data << EP_PWT_A << uint32(bool(m_TowerState & EP_TS_A));
|
||||
data << EP_PWT_H << uint32(bool(m_TowerState & EP_TS_H));
|
||||
data << EP_PWT_N_A << uint32(bool(m_TowerState & EP_TS_N_A));
|
||||
data << EP_PWT_N_H << uint32(bool(m_TowerState & EP_TS_N_H));
|
||||
data << EP_PWT_N << uint32(bool(m_TowerState & EP_TS_N));
|
||||
data << EP_PWT_A << uint32((m_TowerState & EP_TS_A) != 0);
|
||||
data << EP_PWT_H << uint32((m_TowerState & EP_TS_H) != 0);
|
||||
data << EP_PWT_N_A << uint32((m_TowerState & EP_TS_N_A) != 0);
|
||||
data << EP_PWT_N_H << uint32((m_TowerState & EP_TS_N_H) != 0);
|
||||
data << EP_PWT_N << uint32((m_TowerState & EP_TS_N) != 0);
|
||||
}
|
||||
|
||||
void OPvPCapturePointEP_PWT::UpdateTowerState()
|
||||
{
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_A, bool(m_TowerState & EP_TS_A));
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_H, bool(m_TowerState & EP_TS_H));
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_N_A, bool(m_TowerState & EP_TS_N_A));
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_N_H, bool(m_TowerState & EP_TS_N_H));
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_N, bool(m_TowerState & EP_TS_N));
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_A, (m_TowerState & EP_TS_A) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_H, (m_TowerState & EP_TS_H) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_N_A, (m_TowerState & EP_TS_N_A) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_N_H, (m_TowerState & EP_TS_N_H) != 0);
|
||||
m_PvP->SendUpdateWorldState(EP_PWT_N, (m_TowerState & EP_TS_N) != 0);
|
||||
}
|
||||
|
||||
bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player* player)
|
||||
|
||||
@@ -265,31 +265,31 @@ void OPvPCapturePointNA::FillInitialWorldStates(WorldPacket &data)
|
||||
data << NA_UI_TOWER_SLIDER_POS << uint32(50);
|
||||
data << NA_UI_TOWER_SLIDER_N << uint32(100);
|
||||
|
||||
data << NA_MAP_WYVERN_NORTH_NEU_H << uint32(bool(m_WyvernStateNorth & WYVERN_NEU_HORDE));
|
||||
data << NA_MAP_WYVERN_NORTH_NEU_A << uint32(bool(m_WyvernStateNorth & WYVERN_NEU_ALLIANCE));
|
||||
data << NA_MAP_WYVERN_NORTH_H << uint32(bool(m_WyvernStateNorth & WYVERN_HORDE));
|
||||
data << NA_MAP_WYVERN_NORTH_A << uint32(bool(m_WyvernStateNorth & WYVERN_ALLIANCE));
|
||||
data << NA_MAP_WYVERN_NORTH_NEU_H << uint32((m_WyvernStateNorth & WYVERN_NEU_HORDE) != 0);
|
||||
data << NA_MAP_WYVERN_NORTH_NEU_A << uint32((m_WyvernStateNorth & WYVERN_NEU_ALLIANCE) != 0);
|
||||
data << NA_MAP_WYVERN_NORTH_H << uint32((m_WyvernStateNorth & WYVERN_HORDE) != 0);
|
||||
data << NA_MAP_WYVERN_NORTH_A << uint32((m_WyvernStateNorth & WYVERN_ALLIANCE) != 0);
|
||||
|
||||
data << NA_MAP_WYVERN_SOUTH_NEU_H << uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE));
|
||||
data << NA_MAP_WYVERN_SOUTH_NEU_A << uint32(bool(m_WyvernStateSouth & WYVERN_NEU_ALLIANCE));
|
||||
data << NA_MAP_WYVERN_SOUTH_H << uint32(bool(m_WyvernStateSouth & WYVERN_HORDE));
|
||||
data << NA_MAP_WYVERN_SOUTH_A << uint32(bool(m_WyvernStateSouth & WYVERN_ALLIANCE));
|
||||
data << NA_MAP_WYVERN_SOUTH_NEU_H << uint32((m_WyvernStateSouth & WYVERN_NEU_HORDE) != 0);
|
||||
data << NA_MAP_WYVERN_SOUTH_NEU_A << uint32((m_WyvernStateSouth & WYVERN_NEU_ALLIANCE) != 0);
|
||||
data << NA_MAP_WYVERN_SOUTH_H << uint32((m_WyvernStateSouth & WYVERN_HORDE) != 0);
|
||||
data << NA_MAP_WYVERN_SOUTH_A << uint32((m_WyvernStateSouth & WYVERN_ALLIANCE) != 0);
|
||||
|
||||
data << NA_MAP_WYVERN_WEST_NEU_H << uint32(bool(m_WyvernStateWest & WYVERN_NEU_HORDE));
|
||||
data << NA_MAP_WYVERN_WEST_NEU_A << uint32(bool(m_WyvernStateWest & WYVERN_NEU_ALLIANCE));
|
||||
data << NA_MAP_WYVERN_WEST_H << uint32(bool(m_WyvernStateWest & WYVERN_HORDE));
|
||||
data << NA_MAP_WYVERN_WEST_A << uint32(bool(m_WyvernStateWest & WYVERN_ALLIANCE));
|
||||
data << NA_MAP_WYVERN_WEST_NEU_H << uint32((m_WyvernStateWest & WYVERN_NEU_HORDE) != 0);
|
||||
data << NA_MAP_WYVERN_WEST_NEU_A << uint32((m_WyvernStateWest & WYVERN_NEU_ALLIANCE) != 0);
|
||||
data << NA_MAP_WYVERN_WEST_H << uint32((m_WyvernStateWest & WYVERN_HORDE) != 0);
|
||||
data << NA_MAP_WYVERN_WEST_A << uint32((m_WyvernStateWest & WYVERN_ALLIANCE) != 0);
|
||||
|
||||
data << NA_MAP_WYVERN_EAST_NEU_H << uint32(bool(m_WyvernStateEast & WYVERN_NEU_HORDE));
|
||||
data << NA_MAP_WYVERN_EAST_NEU_A << uint32(bool(m_WyvernStateEast & WYVERN_NEU_ALLIANCE));
|
||||
data << NA_MAP_WYVERN_EAST_H << uint32(bool(m_WyvernStateEast & WYVERN_HORDE));
|
||||
data << NA_MAP_WYVERN_EAST_A << uint32(bool(m_WyvernStateEast & WYVERN_ALLIANCE));
|
||||
data << NA_MAP_WYVERN_EAST_NEU_H << uint32((m_WyvernStateEast & WYVERN_NEU_HORDE) != 0);
|
||||
data << NA_MAP_WYVERN_EAST_NEU_A << uint32((m_WyvernStateEast & WYVERN_NEU_ALLIANCE) != 0);
|
||||
data << NA_MAP_WYVERN_EAST_H << uint32((m_WyvernStateEast & WYVERN_HORDE) != 0);
|
||||
data << NA_MAP_WYVERN_EAST_A << uint32((m_WyvernStateEast & WYVERN_ALLIANCE) != 0);
|
||||
|
||||
data << NA_MAP_HALAA_NEUTRAL << uint32(bool(m_HalaaState & HALAA_N));
|
||||
data << NA_MAP_HALAA_NEU_A << uint32(bool(m_HalaaState & HALAA_N_A));
|
||||
data << NA_MAP_HALAA_NEU_H << uint32(bool(m_HalaaState & HALAA_N_H));
|
||||
data << NA_MAP_HALAA_HORDE << uint32(bool(m_HalaaState & HALAA_H));
|
||||
data << NA_MAP_HALAA_ALLIANCE << uint32(bool(m_HalaaState & HALAA_A));
|
||||
data << NA_MAP_HALAA_NEUTRAL << uint32((m_HalaaState & HALAA_N) != 0);
|
||||
data << NA_MAP_HALAA_NEU_A << uint32((m_HalaaState & HALAA_N_A) != 0);
|
||||
data << NA_MAP_HALAA_NEU_H << uint32((m_HalaaState & HALAA_N_H) != 0);
|
||||
data << NA_MAP_HALAA_HORDE << uint32((m_HalaaState & HALAA_H) != 0);
|
||||
data << NA_MAP_HALAA_ALLIANCE << uint32((m_HalaaState & HALAA_A) != 0);
|
||||
}
|
||||
|
||||
void OutdoorPvPNA::SendRemoveWorldStates(Player* player)
|
||||
@@ -620,41 +620,41 @@ void OPvPCapturePointNA::SendChangePhase()
|
||||
|
||||
void OPvPCapturePointNA::UpdateHalaaWorldState()
|
||||
{
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, uint32(bool(m_HalaaState & HALAA_N)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, uint32(bool(m_HalaaState & HALAA_N_A)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, uint32(bool(m_HalaaState & HALAA_N_H)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE, uint32(bool(m_HalaaState & HALAA_H)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, uint32(bool(m_HalaaState & HALAA_A)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, uint32((m_HalaaState & HALAA_N) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, uint32((m_HalaaState & HALAA_N_A) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, uint32((m_HalaaState & HALAA_N_H) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE, uint32((m_HalaaState & HALAA_H) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, uint32((m_HalaaState & HALAA_A) != 0));
|
||||
}
|
||||
|
||||
void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost)
|
||||
{
|
||||
switch (roost)
|
||||
{
|
||||
case NA_ROOST_S:
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_ALLIANCE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, uint32(bool(m_WyvernStateSouth & WYVERN_HORDE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, uint32(bool(m_WyvernStateSouth & WYVERN_ALLIANCE)));
|
||||
break;
|
||||
case NA_ROOST_N:
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, uint32(bool(m_WyvernStateNorth & WYVERN_NEU_HORDE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, uint32(bool(m_WyvernStateNorth & WYVERN_NEU_ALLIANCE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, uint32(bool(m_WyvernStateNorth & WYVERN_HORDE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, uint32(bool(m_WyvernStateNorth & WYVERN_ALLIANCE)));
|
||||
break;
|
||||
case NA_ROOST_W:
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, uint32(bool(m_WyvernStateWest & WYVERN_NEU_HORDE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, uint32(bool(m_WyvernStateWest & WYVERN_NEU_ALLIANCE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, uint32(bool(m_WyvernStateWest & WYVERN_HORDE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, uint32(bool(m_WyvernStateWest & WYVERN_ALLIANCE)));
|
||||
break;
|
||||
case NA_ROOST_E:
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, uint32(bool(m_WyvernStateEast & WYVERN_NEU_HORDE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, uint32(bool(m_WyvernStateEast & WYVERN_NEU_ALLIANCE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, uint32(bool(m_WyvernStateEast & WYVERN_HORDE)));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, uint32(bool(m_WyvernStateEast & WYVERN_ALLIANCE)));
|
||||
break;
|
||||
case NA_ROOST_S:
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, uint32((m_WyvernStateSouth & WYVERN_NEU_HORDE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, uint32((m_WyvernStateSouth & WYVERN_NEU_ALLIANCE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, uint32((m_WyvernStateSouth & WYVERN_HORDE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, uint32((m_WyvernStateSouth & WYVERN_ALLIANCE) != 0));
|
||||
break;
|
||||
case NA_ROOST_N:
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, uint32((m_WyvernStateNorth & WYVERN_NEU_HORDE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, uint32((m_WyvernStateNorth & WYVERN_NEU_ALLIANCE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, uint32((m_WyvernStateNorth & WYVERN_HORDE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, uint32((m_WyvernStateNorth & WYVERN_ALLIANCE) != 0));
|
||||
break;
|
||||
case NA_ROOST_W:
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, uint32((m_WyvernStateWest & WYVERN_NEU_HORDE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, uint32((m_WyvernStateWest & WYVERN_NEU_ALLIANCE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, uint32((m_WyvernStateWest & WYVERN_HORDE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, uint32((m_WyvernStateWest & WYVERN_ALLIANCE) != 0));
|
||||
break;
|
||||
case NA_ROOST_E:
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, uint32((m_WyvernStateEast & WYVERN_NEU_HORDE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, uint32((m_WyvernStateEast & WYVERN_NEU_ALLIANCE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, uint32((m_WyvernStateEast & WYVERN_HORDE) != 0));
|
||||
m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, uint32((m_WyvernStateEast & WYVERN_ALLIANCE) != 0));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -49,9 +49,9 @@ OPvPCapturePointTF::OPvPCapturePointTF(OutdoorPvP* pvp, OutdoorPvPTF_TowerType t
|
||||
|
||||
void OPvPCapturePointTF::FillInitialWorldStates(WorldPacket &data)
|
||||
{
|
||||
data << uint32(TFTowerWorldStates[m_TowerType].n) << uint32(bool(m_TowerState & TF_TOWERSTATE_N));
|
||||
data << uint32(TFTowerWorldStates[m_TowerType].h) << uint32(bool(m_TowerState & TF_TOWERSTATE_H));
|
||||
data << uint32(TFTowerWorldStates[m_TowerType].a) << uint32(bool(m_TowerState & TF_TOWERSTATE_A));
|
||||
data << uint32(TFTowerWorldStates[m_TowerType].n) << uint32((m_TowerState & TF_TOWERSTATE_N) != 0);
|
||||
data << uint32(TFTowerWorldStates[m_TowerType].h) << uint32((m_TowerState & TF_TOWERSTATE_H) != 0);
|
||||
data << uint32(TFTowerWorldStates[m_TowerType].a) << uint32((m_TowerState & TF_TOWERSTATE_A) != 0);
|
||||
}
|
||||
|
||||
void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data)
|
||||
@@ -106,9 +106,9 @@ void OutdoorPvPTF::SendRemoveWorldStates(Player* player)
|
||||
|
||||
void OPvPCapturePointTF::UpdateTowerState()
|
||||
{
|
||||
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].n), uint32(bool(m_TowerState & TF_TOWERSTATE_N)));
|
||||
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].h), uint32(bool(m_TowerState & TF_TOWERSTATE_H)));
|
||||
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a), uint32(bool(m_TowerState & TF_TOWERSTATE_A)));
|
||||
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].n), uint32((m_TowerState & TF_TOWERSTATE_N) != 0));
|
||||
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].h), uint32((m_TowerState & TF_TOWERSTATE_H) != 0));
|
||||
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a), uint32((m_TowerState & TF_TOWERSTATE_A) != 0));
|
||||
}
|
||||
|
||||
bool OPvPCapturePointTF::HandlePlayerEnter(Player* player)
|
||||
|
||||
@@ -34,22 +34,22 @@ OPvPCapturePointZM_Beacon::OPvPCapturePointZM_Beacon(OutdoorPvP* pvp, ZM_BeaconT
|
||||
|
||||
void OPvPCapturePointZM_Beacon::FillInitialWorldStates(WorldPacket &data)
|
||||
{
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].ui_tower_n) << uint32(bool(m_TowerState & ZM_TOWERSTATE_N));
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].map_tower_n) << uint32(bool(m_TowerState & ZM_TOWERSTATE_N));
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].ui_tower_a) << uint32(bool(m_TowerState & ZM_TOWERSTATE_A));
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].map_tower_a) << uint32(bool(m_TowerState & ZM_TOWERSTATE_A));
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].ui_tower_h) << uint32(bool(m_TowerState & ZM_TOWERSTATE_H));
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].map_tower_h) << uint32(bool(m_TowerState & ZM_TOWERSTATE_H));
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].ui_tower_n) << uint32((m_TowerState & ZM_TOWERSTATE_N) != 0);
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].map_tower_n) << uint32((m_TowerState & ZM_TOWERSTATE_N) != 0);
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].ui_tower_a) << uint32((m_TowerState & ZM_TOWERSTATE_A) != 0);
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].map_tower_a) << uint32((m_TowerState & ZM_TOWERSTATE_A) != 0);
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].ui_tower_h) << uint32((m_TowerState & ZM_TOWERSTATE_H) != 0);
|
||||
data << uint32(ZMBeaconInfo[m_TowerType].map_tower_h) << uint32((m_TowerState & ZM_TOWERSTATE_H) != 0);
|
||||
}
|
||||
|
||||
void OPvPCapturePointZM_Beacon::UpdateTowerState()
|
||||
{
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_n), uint32(bool(m_TowerState & ZM_TOWERSTATE_N)));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_n), uint32(bool(m_TowerState & ZM_TOWERSTATE_N)));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_a), uint32(bool(m_TowerState & ZM_TOWERSTATE_A)));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_a), uint32(bool(m_TowerState & ZM_TOWERSTATE_A)));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H)));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H)));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_n), uint32((m_TowerState & ZM_TOWERSTATE_N) != 0));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_n), uint32((m_TowerState & ZM_TOWERSTATE_N) != 0));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_a), uint32((m_TowerState & ZM_TOWERSTATE_A) != 0));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_a), uint32((m_TowerState & ZM_TOWERSTATE_A) != 0));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_h), uint32((m_TowerState & ZM_TOWERSTATE_H) != 0));
|
||||
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h), uint32((m_TowerState & ZM_TOWERSTATE_H) != 0));
|
||||
}
|
||||
|
||||
bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player* player)
|
||||
@@ -264,9 +264,9 @@ OPvPCapturePointZM_GraveYard::OPvPCapturePointZM_GraveYard(OutdoorPvP* pvp)
|
||||
|
||||
void OPvPCapturePointZM_GraveYard::UpdateTowerState()
|
||||
{
|
||||
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N)));
|
||||
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H)));
|
||||
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A)));
|
||||
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, uint32((m_GraveYardState & ZM_GRAVEYARD_N) != 0));
|
||||
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, uint32((m_GraveYardState & ZM_GRAVEYARD_H) != 0));
|
||||
m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, uint32((m_GraveYardState & ZM_GRAVEYARD_A) != 0));
|
||||
|
||||
m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, uint32(m_BothControllingFaction == ALLIANCE));
|
||||
m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, uint32(m_BothControllingFaction != ALLIANCE));
|
||||
@@ -276,9 +276,9 @@ void OPvPCapturePointZM_GraveYard::UpdateTowerState()
|
||||
|
||||
void OPvPCapturePointZM_GraveYard::FillInitialWorldStates(WorldPacket &data)
|
||||
{
|
||||
data << ZM_MAP_GRAVEYARD_N << uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N));
|
||||
data << ZM_MAP_GRAVEYARD_H << uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H));
|
||||
data << ZM_MAP_GRAVEYARD_A << uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A));
|
||||
data << ZM_MAP_GRAVEYARD_N << uint32((m_GraveYardState & ZM_GRAVEYARD_N) != 0);
|
||||
data << ZM_MAP_GRAVEYARD_H << uint32((m_GraveYardState & ZM_GRAVEYARD_H) != 0);
|
||||
data << ZM_MAP_GRAVEYARD_A << uint32((m_GraveYardState & ZM_GRAVEYARD_A) != 0);
|
||||
|
||||
data << ZM_MAP_ALLIANCE_FLAG_READY << uint32(m_BothControllingFaction == ALLIANCE);
|
||||
data << ZM_MAP_ALLIANCE_FLAG_NOT_READY << uint32(m_BothControllingFaction != ALLIANCE);
|
||||
|
||||
@@ -880,7 +880,7 @@ public:
|
||||
|
||||
bool Validate(SpellInfo const* /*spellInfo*/) override
|
||||
{
|
||||
return sSpellMgr->GetSpellInfo(SPELL_REFLECTIVE_SHIELD_T);
|
||||
return sSpellMgr->GetSpellInfo(SPELL_REFLECTIVE_SHIELD_T) != nullptr;
|
||||
}
|
||||
|
||||
void Trigger(AuraEffect* aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||
|
||||
@@ -731,7 +731,7 @@ class npc_simon_bunny : public CreatureScript
|
||||
{
|
||||
me->SetCanFly(true);
|
||||
|
||||
large = (bool)id;
|
||||
large = id != 0;
|
||||
playerGUID = guid;
|
||||
StartGame();
|
||||
}
|
||||
|
||||
@@ -296,7 +296,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader
|
||||
bool CheckProc(ProcEventInfo& /*eventInfo*/)
|
||||
{
|
||||
_procTarget = GetTarget()->GetOwner();
|
||||
return _procTarget;
|
||||
return _procTarget != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
|
||||
@@ -3028,7 +3028,7 @@ class spell_gen_replenishment : public SpellScriptLoader
|
||||
|
||||
bool Load() override
|
||||
{
|
||||
return GetUnitOwner()->GetPower(POWER_MANA);
|
||||
return GetUnitOwner()->getPowerType() == POWER_MANA;
|
||||
}
|
||||
|
||||
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
|
||||
|
||||
@@ -486,7 +486,7 @@ class spell_hun_misdirection : public SpellScriptLoader
|
||||
|
||||
bool CheckProc(ProcEventInfo& /*eventInfo*/)
|
||||
{
|
||||
return GetTarget()->GetRedirectThreatTarget();
|
||||
return GetTarget()->GetRedirectThreatTarget() != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
|
||||
|
||||
@@ -166,7 +166,7 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader
|
||||
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
return eventInfo.GetProcTarget();
|
||||
return eventInfo.GetProcTarget() != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
|
||||
@@ -128,7 +128,7 @@ class spell_mage_burnout : public SpellScriptLoader
|
||||
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
return eventInfo.GetDamageInfo()->GetSpellInfo(); // eventInfo.GetSpellInfo()
|
||||
return eventInfo.GetDamageInfo()->GetSpellInfo() != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
@@ -381,7 +381,7 @@ class spell_mage_ignite : public SpellScriptLoader
|
||||
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
return eventInfo.GetProcTarget();
|
||||
return eventInfo.GetProcTarget() != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
@@ -505,7 +505,7 @@ class spell_mage_master_of_elements : public SpellScriptLoader
|
||||
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
return eventInfo.GetDamageInfo()->GetSpellInfo(); // eventInfo.GetSpellInfo()
|
||||
return eventInfo.GetDamageInfo()->GetSpellInfo() != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
|
||||
@@ -1250,7 +1250,7 @@ class spell_pal_seal_of_righteousness : public SpellScriptLoader
|
||||
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
return eventInfo.GetProcTarget();
|
||||
return eventInfo.GetProcTarget() != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
|
||||
@@ -149,7 +149,7 @@ class spell_pri_divine_aegis : public SpellScriptLoader
|
||||
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
return eventInfo.GetProcTarget();
|
||||
return eventInfo.GetProcTarget() != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
@@ -467,7 +467,7 @@ class spell_pri_mana_leech : public SpellScriptLoader
|
||||
bool CheckProc(ProcEventInfo& /*eventInfo*/)
|
||||
{
|
||||
_procTarget = GetTarget()->GetOwner();
|
||||
return _procTarget;
|
||||
return _procTarget != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
|
||||
|
||||
@@ -1810,12 +1810,11 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader
|
||||
|
||||
void HandleScript(SpellEffIndex /*effIndex*/)
|
||||
{
|
||||
bool failed = RAND(0, 1); // 50% chance
|
||||
Creature* creature = GetCaster()->ToCreature();
|
||||
if (Player* player = GetHitPlayer())
|
||||
{
|
||||
if (failed)
|
||||
if (roll_chance_i(50))
|
||||
{
|
||||
Creature* creature = GetCaster()->ToCreature();
|
||||
player->CastSpell(creature, SPELL_BEAR_FLANK_FAIL);
|
||||
creature->AI()->Talk(0, player);
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
_procTarget = eventInfo.GetActor()->SelectNearbyTarget(eventInfo.GetProcTarget());
|
||||
return _procTarget;
|
||||
return _procTarget != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
@@ -119,7 +119,7 @@ class spell_rog_cheat_death : public SpellScriptLoader
|
||||
bool Load() override
|
||||
{
|
||||
absorbChance = GetSpellInfo()->Effects[EFFECT_0].CalcValue();
|
||||
return GetUnitOwner()->ToPlayer();
|
||||
return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER;
|
||||
}
|
||||
|
||||
void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
|
||||
@@ -637,7 +637,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader
|
||||
bool CheckProc(ProcEventInfo& /*eventInfo*/)
|
||||
{
|
||||
_redirectTarget = GetTarget()->GetRedirectThreatTarget();
|
||||
return _redirectTarget;
|
||||
return _redirectTarget != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
|
||||
|
||||
@@ -743,7 +743,7 @@ class spell_sha_item_mana_surge : public SpellScriptLoader
|
||||
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
return eventInfo.GetDamageInfo()->GetSpellInfo();
|
||||
return eventInfo.GetDamageInfo()->GetSpellInfo() != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
|
||||
@@ -697,7 +697,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
_procTarget = eventInfo.GetActor()->SelectNearbyTarget(eventInfo.GetProcTarget());
|
||||
return _procTarget;
|
||||
return _procTarget != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
@@ -801,7 +801,7 @@ class spell_warr_vigilance : public SpellScriptLoader
|
||||
bool CheckProc(ProcEventInfo& /*eventInfo*/)
|
||||
{
|
||||
_procTarget = GetCaster();
|
||||
return _procTarget;
|
||||
return _procTarget != nullptr;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
|
||||
|
||||
Reference in new issue
Block a user