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

Core: Clean up script variables to make variables consistant/standardized, and some additional warning-removals:

Browse Source 
+ Fix compilewarning in Unit.cpp
+ Remove/comment out unused parameters for some commandscripts/scripts (warnings)
+ Replace "plr" with "player" all over the scriptbase for consistency
This commit is contained in:
click
2011-07-01 03:00:39 +02:00
parent ed4c9986c1
commit a9c9ab0efa
35 changed files with 485 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
+74 -74
View File
@@ -127,23 +127,23 @@ void OPvPCapturePointEP_EWT::UpdateTowerState()
m_PvP->SendUpdateWorldState(EP_EWT_N , bool(m_TowerState & EP_TS_N));
}
bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player* plr)
bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player* player)
{
if (OPvPCapturePoint::HandlePlayerEnter(plr))
if (OPvPCapturePoint::HandlePlayerEnter(player))
{
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 1);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 1);
uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, phase);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, phase);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
return true;
}
return false;
}
void OPvPCapturePointEP_EWT::HandlePlayerLeave(Player* plr)
void OPvPCapturePointEP_EWT::HandlePlayerLeave(Player* player)
{
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(plr);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(player);
}
void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team)
@@ -276,23 +276,23 @@ void OPvPCapturePointEP_NPT::UpdateTowerState()
m_PvP->SendUpdateWorldState(EP_NPT_N , bool(m_TowerState & EP_TS_N));
}
bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player* plr)
bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player* player)
{
if (OPvPCapturePoint::HandlePlayerEnter(plr))
if (OPvPCapturePoint::HandlePlayerEnter(player))
{
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 1);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 1);
uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, phase);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, phase);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
return true;
}
return false;
}
void OPvPCapturePointEP_NPT::HandlePlayerLeave(Player* plr)
void OPvPCapturePointEP_NPT::HandlePlayerLeave(Player* player)
{
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(plr);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(player);
}
void OPvPCapturePointEP_NPT::SummonGO(uint32 team)
@@ -408,23 +408,23 @@ void OPvPCapturePointEP_CGT::UpdateTowerState()
m_PvP->SendUpdateWorldState(EP_CGT_N , bool(m_TowerState & EP_TS_N));
}
bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player* plr)
bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player* player)
{
if (OPvPCapturePoint::HandlePlayerEnter(plr))
if (OPvPCapturePoint::HandlePlayerEnter(player))
{
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 1);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 1);
uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, phase);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, phase);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
return true;
}
return false;
}
void OPvPCapturePointEP_CGT::HandlePlayerLeave(Player* plr)
void OPvPCapturePointEP_CGT::HandlePlayerLeave(Player* player)
{
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(plr);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(player);
}
void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team)
@@ -547,23 +547,23 @@ void OPvPCapturePointEP_PWT::UpdateTowerState()
m_PvP->SendUpdateWorldState(EP_PWT_N , bool(m_TowerState & EP_TS_N));
}
bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player* plr)
bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player* player)
{
if (OPvPCapturePoint::HandlePlayerEnter(plr))
if (OPvPCapturePoint::HandlePlayerEnter(player))
{
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 1);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 1);
uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, phase);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, phase);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
return true;
}
return false;
}
void OPvPCapturePointEP_PWT::HandlePlayerLeave(Player* plr)
void OPvPCapturePointEP_PWT::HandlePlayerLeave(Player* player)
{
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(plr);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(player);
}
void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
@@ -658,58 +658,58 @@ bool OutdoorPvPEP::Update(uint32 diff)
return false;
}
void OutdoorPvPEP::HandlePlayerEnterZone(Player* plr, uint32 zone)
void OutdoorPvPEP::HandlePlayerEnterZone(Player* player, uint32 zone)
{
// add buffs
if (plr->GetTeam() == ALLIANCE)
if (player->GetTeam() == ALLIANCE)
{
if (m_AllianceTowersControlled && m_AllianceTowersControlled < 5)
plr->CastSpell(plr, EP_AllianceBuffs[m_AllianceTowersControlled-1], true);
player->CastSpell(player, EP_AllianceBuffs[m_AllianceTowersControlled-1], true);
}
else
{
if (m_HordeTowersControlled && m_HordeTowersControlled < 5)
plr->CastSpell(plr, EP_HordeBuffs[m_HordeTowersControlled-1], true);
player->CastSpell(player, EP_HordeBuffs[m_HordeTowersControlled-1], true);
}
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
OutdoorPvP::HandlePlayerEnterZone(player, zone);
}
void OutdoorPvPEP::HandlePlayerLeaveZone(Player* plr, uint32 zone)
void OutdoorPvPEP::HandlePlayerLeaveZone(Player* player, uint32 zone)
{
// remove buffs
if (plr->GetTeam() == ALLIANCE)
if (player->GetTeam() == ALLIANCE)
{
for (int i = 0; i < 4; ++i)
plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]);
player->RemoveAurasDueToSpell(EP_AllianceBuffs[i]);
}
else
{
for (int i = 0; i < 4; ++i)
plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]);
player->RemoveAurasDueToSpell(EP_HordeBuffs[i]);
}
OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
OutdoorPvP::HandlePlayerLeaveZone(player, zone);
}
void OutdoorPvPEP::BuffTeams()
{
for (PlayerSet::iterator itr = m_players[0].begin(); itr != m_players[0].end(); ++itr)
{
Player* plr = *itr;
Player* player = *itr;
{
for (int i = 0; i < 4; ++i)
plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]);
player->RemoveAurasDueToSpell(EP_AllianceBuffs[i]);
if (m_AllianceTowersControlled && m_AllianceTowersControlled < 5)
plr->CastSpell(plr, EP_AllianceBuffs[m_AllianceTowersControlled-1], true);
player->CastSpell(player, EP_AllianceBuffs[m_AllianceTowersControlled-1], true);
}
}
for (PlayerSet::iterator itr = m_players[1].begin(); itr != m_players[1].end(); ++itr)
{
Player* plr = *itr;
Player* player = *itr;
{
for (int i = 0; i < 4; ++i)
plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]);
player->RemoveAurasDueToSpell(EP_HordeBuffs[i]);
if (m_HordeTowersControlled && m_HordeTowersControlled < 5)
plr->CastSpell(plr, EP_HordeBuffs[m_HordeTowersControlled-1], true);
player->CastSpell(player, EP_HordeBuffs[m_HordeTowersControlled-1], true);
}
}
}
@@ -727,37 +727,37 @@ void OutdoorPvPEP::FillInitialWorldStates(WorldPacket & data)
}
}
void OutdoorPvPEP::SendRemoveWorldStates(Player* plr)
void OutdoorPvPEP::SendRemoveWorldStates(Player* player)
{
plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_A, 0);
plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_H, 0);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, 0);
plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, 0);
player->SendUpdateWorldState(EP_UI_TOWER_COUNT_A, 0);
player->SendUpdateWorldState(EP_UI_TOWER_COUNT_H, 0);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, 0);
player->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, 0);
plr->SendUpdateWorldState(EP_EWT_A, 0);
plr->SendUpdateWorldState(EP_EWT_H, 0);
plr->SendUpdateWorldState(EP_EWT_N, 0);
plr->SendUpdateWorldState(EP_EWT_N_A, 0);
plr->SendUpdateWorldState(EP_EWT_N_H, 0);
player->SendUpdateWorldState(EP_EWT_A, 0);
player->SendUpdateWorldState(EP_EWT_H, 0);
player->SendUpdateWorldState(EP_EWT_N, 0);
player->SendUpdateWorldState(EP_EWT_N_A, 0);
player->SendUpdateWorldState(EP_EWT_N_H, 0);
plr->SendUpdateWorldState(EP_PWT_A, 0);
plr->SendUpdateWorldState(EP_PWT_H, 0);
plr->SendUpdateWorldState(EP_PWT_N, 0);
plr->SendUpdateWorldState(EP_PWT_N_A, 0);
plr->SendUpdateWorldState(EP_PWT_N_H, 0);
player->SendUpdateWorldState(EP_PWT_A, 0);
player->SendUpdateWorldState(EP_PWT_H, 0);
player->SendUpdateWorldState(EP_PWT_N, 0);
player->SendUpdateWorldState(EP_PWT_N_A, 0);
player->SendUpdateWorldState(EP_PWT_N_H, 0);
plr->SendUpdateWorldState(EP_NPT_A, 0);
plr->SendUpdateWorldState(EP_NPT_H, 0);
plr->SendUpdateWorldState(EP_NPT_N, 0);
plr->SendUpdateWorldState(EP_NPT_N_A, 0);
plr->SendUpdateWorldState(EP_NPT_N_H, 0);
player->SendUpdateWorldState(EP_NPT_A, 0);
player->SendUpdateWorldState(EP_NPT_H, 0);
player->SendUpdateWorldState(EP_NPT_N, 0);
player->SendUpdateWorldState(EP_NPT_N_A, 0);
player->SendUpdateWorldState(EP_NPT_N_H, 0);
plr->SendUpdateWorldState(EP_CGT_A, 0);
plr->SendUpdateWorldState(EP_CGT_H, 0);
plr->SendUpdateWorldState(EP_CGT_N, 0);
plr->SendUpdateWorldState(EP_CGT_N_A, 0);
plr->SendUpdateWorldState(EP_CGT_N_H, 0);
player->SendUpdateWorldState(EP_CGT_A, 0);
player->SendUpdateWorldState(EP_CGT_H, 0);
player->SendUpdateWorldState(EP_CGT_N, 0);
player->SendUpdateWorldState(EP_CGT_N_A, 0);
player->SendUpdateWorldState(EP_CGT_N_H, 0);
}
class OutdoorPvP_eastern_plaguelands : public OutdoorPvPScript
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
+11 -11
View File
@@ -197,8 +197,8 @@ class OPvPCapturePointEP_EWT : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
bool HandlePlayerEnter(Player* player);
void HandlePlayerLeave(Player* player);
protected:
@@ -228,8 +228,8 @@ class OPvPCapturePointEP_NPT : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
bool HandlePlayerEnter(Player* player);
void HandlePlayerLeave(Player* player);
protected:
@@ -259,8 +259,8 @@ class OPvPCapturePointEP_CGT : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
bool HandlePlayerEnter(Player* player);
void HandlePlayerLeave(Player* player);
protected:
@@ -290,8 +290,8 @@ class OPvPCapturePointEP_PWT : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
bool HandlePlayerEnter(Player* player);
void HandlePlayerLeave(Player* player);
protected:
@@ -319,14 +319,14 @@ class OutdoorPvPEP : public OutdoorPvP
bool SetupOutdoorPvP();
void HandlePlayerEnterZone(Player* plr, uint32 zone);
void HandlePlayerLeaveZone(Player* plr, uint32 zone);
void HandlePlayerEnterZone(Player* player, uint32 zone);
void HandlePlayerLeaveZone(Player* player, uint32 zone);
bool Update(uint32 diff);
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player* plr);
void SendRemoveWorldStates(Player* player);
void BuffTeams();
src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
+34 -34
View File
@@ -81,34 +81,34 @@ bool OutdoorPvPHP::SetupOutdoorPvP()
return true;
}
void OutdoorPvPHP::HandlePlayerEnterZone(Player* plr, uint32 zone)
void OutdoorPvPHP::HandlePlayerEnterZone(Player* player, uint32 zone)
{
// add buffs
if (plr->GetTeam() == ALLIANCE)
if (player->GetTeam() == ALLIANCE)
{
if (m_AllianceTowersControlled >=3)
plr->CastSpell(plr, AllianceBuff, true);
player->CastSpell(player, AllianceBuff, true);
}
else
{
if (m_HordeTowersControlled >=3)
plr->CastSpell(plr, HordeBuff, true);
player->CastSpell(player, HordeBuff, true);
}
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
OutdoorPvP::HandlePlayerEnterZone(player, zone);
}
void OutdoorPvPHP::HandlePlayerLeaveZone(Player* plr, uint32 zone)
void OutdoorPvPHP::HandlePlayerLeaveZone(Player* player, uint32 zone)
{
// remove buffs
if (plr->GetTeam() == ALLIANCE)
if (player->GetTeam() == ALLIANCE)
{
plr->RemoveAurasDueToSpell(AllianceBuff);
player->RemoveAurasDueToSpell(AllianceBuff);
}
else
{
plr->RemoveAurasDueToSpell(HordeBuff);
player->RemoveAurasDueToSpell(HordeBuff);
}
OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
OutdoorPvP::HandlePlayerLeaveZone(player, zone);
}
bool OutdoorPvPHP::Update(uint32 diff)
@@ -131,20 +131,20 @@ bool OutdoorPvPHP::Update(uint32 diff)
return changed;
}
void OutdoorPvPHP::SendRemoveWorldStates(Player* plr)
void OutdoorPvPHP::SendRemoveWorldStates(Player* player)
{
plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_H, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_H, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_A, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS, 0);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 0);
player->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A, 0);
player->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_H, 0);
player->SendUpdateWorldState(HP_UI_TOWER_COUNT_H, 0);
player->SendUpdateWorldState(HP_UI_TOWER_COUNT_A, 0);
player->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N, 0);
player->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS, 0);
player->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 0);
for (int i = 0; i < HP_TOWER_NUM; ++i)
{
plr->SendUpdateWorldState(HP_MAP_N[i], 0);
plr->SendUpdateWorldState(HP_MAP_A[i], 0);
plr->SendUpdateWorldState(HP_MAP_H[i], 0);
player->SendUpdateWorldState(HP_MAP_N[i], 0);
player->SendUpdateWorldState(HP_MAP_A[i], 0);
player->SendUpdateWorldState(HP_MAP_H[i], 0);
}
}
@@ -301,34 +301,34 @@ void OPvPCapturePointHP::FillInitialWorldStates(WorldPacket &data)
}
}
bool OPvPCapturePointHP::HandlePlayerEnter(Player* plr)
bool OPvPCapturePointHP::HandlePlayerEnter(Player* player)
{
if (OPvPCapturePoint::HandlePlayerEnter(plr))
if (OPvPCapturePoint::HandlePlayerEnter(player))
{
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 1);
player->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 1);
uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS, phase);
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N, m_neutralValuePct);
player->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS, phase);
player->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N, m_neutralValuePct);
return true;
}
return false;
}
void OPvPCapturePointHP::HandlePlayerLeave(Player* plr)
void OPvPCapturePointHP::HandlePlayerLeave(Player* player)
{
plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(plr);
player->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(player);
}
void OutdoorPvPHP::HandleKillImpl(Player* plr, Unit* killed)
void OutdoorPvPHP::HandleKillImpl(Player* player, Unit* killed)
{
if (killed->GetTypeId() != TYPEID_PLAYER)
return;
if (plr->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE)
plr->CastSpell(plr, AlliancePlayerKillReward, true);
else if (plr->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE)
plr->CastSpell(plr, HordePlayerKillReward, true);
if (player->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE)
player->CastSpell(player, AlliancePlayerKillReward, true);
else if (player->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE)
player->CastSpell(player, HordePlayerKillReward, true);
}
class OutdoorPvP_hellfire_peninsula : public OutdoorPvPScript
src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
+6 -6
View File
@@ -98,8 +98,8 @@ class OPvPCapturePointHP : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
bool HandlePlayerEnter(Player* player);
void HandlePlayerLeave(Player* player);
private:
@@ -116,16 +116,16 @@ class OutdoorPvPHP : public OutdoorPvP
bool SetupOutdoorPvP();
void HandlePlayerEnterZone(Player* plr, uint32 zone);
void HandlePlayerLeaveZone(Player* plr, uint32 zone);
void HandlePlayerEnterZone(Player* player, uint32 zone);
void HandlePlayerLeaveZone(Player* player, uint32 zone);
bool Update(uint32 diff);
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player* plr);
void SendRemoveWorldStates(Player* player);
void HandleKillImpl(Player* plr, Unit* killed);
void HandleKillImpl(Player* player, Unit* killed);
private:
src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+68 -68
View File
@@ -29,15 +29,15 @@ OutdoorPvPNA::OutdoorPvPNA()
m_TypeId = OUTDOOR_PVP_NA;
}
void OutdoorPvPNA::HandleKillImpl(Player* plr, Unit* killed)
void OutdoorPvPNA::HandleKillImpl(Player* player, Unit* killed)
{
if (killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != killed->ToPlayer()->GetTeam())
if (killed->GetTypeId() == TYPEID_PLAYER && player->GetTeam() != killed->ToPlayer()->GetTeam())
{
plr->KilledMonsterCredit(NA_CREDIT_MARKER, 0); // 0 guid, btw it isn't even used in killedmonster function :S
if (plr->GetTeam() == ALLIANCE)
plr->CastSpell(plr, NA_KILL_TOKEN_ALLIANCE, true);
player->KilledMonsterCredit(NA_CREDIT_MARKER, 0); // 0 guid, btw it isn't even used in killedmonster function :S
if (player->GetTeam() == ALLIANCE)
player->CastSpell(player, NA_KILL_TOKEN_ALLIANCE, true);
else
plr->CastSpell(plr, NA_KILL_TOKEN_HORDE, true);
player->CastSpell(player, NA_KILL_TOKEN_HORDE, true);
}
}
@@ -178,23 +178,23 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team)
UpdateWyvernRoostWorldState(NA_ROOST_E);
}
bool OPvPCapturePointNA::HandlePlayerEnter(Player* plr)
bool OPvPCapturePointNA::HandlePlayerEnter(Player* player)
{
if (OPvPCapturePoint::HandlePlayerEnter(plr))
if (OPvPCapturePoint::HandlePlayerEnter(player))
{
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 1);
player->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 1);
uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS, phase);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N, m_neutralValuePct);
player->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS, phase);
player->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N, m_neutralValuePct);
return true;
}
return false;
}
void OPvPCapturePointNA::HandlePlayerLeave(Player* plr)
void OPvPCapturePointNA::HandlePlayerLeave(Player* player)
{
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(plr);
player->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(player);
}
OPvPCapturePointNA::OPvPCapturePointNA(OutdoorPvP *pvp) :
@@ -220,19 +220,19 @@ bool OutdoorPvPNA::SetupOutdoorPvP()
return true;
}
void OutdoorPvPNA::HandlePlayerEnterZone(Player* plr, uint32 zone)
void OutdoorPvPNA::HandlePlayerEnterZone(Player* player, uint32 zone)
{
// add buffs
if (plr->GetTeam() == m_obj->m_ControllingFaction)
plr->CastSpell(plr, NA_CAPTURE_BUFF, true);
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
if (player->GetTeam() == m_obj->m_ControllingFaction)
player->CastSpell(player, NA_CAPTURE_BUFF, true);
OutdoorPvP::HandlePlayerEnterZone(player, zone);
}
void OutdoorPvPNA::HandlePlayerLeaveZone(Player* plr, uint32 zone)
void OutdoorPvPNA::HandlePlayerLeaveZone(Player* player, uint32 zone)
{
// remove buffs
plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF);
OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
player->RemoveAurasDueToSpell(NA_CAPTURE_BUFF);
OutdoorPvP::HandlePlayerLeaveZone(player, zone);
}
void OutdoorPvPNA::FillInitialWorldStates(WorldPacket &data)
@@ -292,36 +292,36 @@ void OPvPCapturePointNA::FillInitialWorldStates(WorldPacket &data)
data << NA_MAP_HALAA_ALLIANCE << uint32(bool(m_HalaaState & HALAA_A));
}
void OutdoorPvPNA::SendRemoveWorldStates(Player* plr)
void OutdoorPvPNA::SendRemoveWorldStates(Player* player)
{
plr->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0);
plr->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0);
plr->SendUpdateWorldState(NA_UI_GUARDS_MAX, 0);
plr->SendUpdateWorldState(NA_UI_GUARDS_LEFT, 0);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS, 0);
plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, 0);
plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE, 0);
plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, 0);
player->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0);
player->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0);
player->SendUpdateWorldState(NA_UI_GUARDS_MAX, 0);
player->SendUpdateWorldState(NA_UI_GUARDS_LEFT, 0);
player->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0);
player->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS, 0);
player->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, 0);
player->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, 0);
player->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, 0);
player->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, 0);
player->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, 0);
player->SendUpdateWorldState(NA_MAP_HALAA_HORDE, 0);
player->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, 0);
}
bool OutdoorPvPNA::Update(uint32 diff)
@@ -329,7 +329,7 @@ bool OutdoorPvPNA::Update(uint32 diff)
return m_obj->Update(diff);
}
bool OPvPCapturePointNA::HandleCustomSpell(Player* plr, uint32 spellId, GameObject* /*go*/)
bool OPvPCapturePointNA::HandleCustomSpell(Player* player, uint32 spellId, GameObject* /*go*/)
{
std::vector<uint32> nodes;
nodes.resize(2);
@@ -339,33 +339,33 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* plr, uint32 spellId, GameObje
case NA_SPELL_FLY_NORTH:
nodes[0] = FlightPathStartNodes[NA_ROOST_N];
nodes[1] = FlightPathEndNodes[NA_ROOST_N];
plr->ActivateTaxiPathTo(nodes);
plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
plr->UpdatePvP(true, true);
player->ActivateTaxiPathTo(nodes);
player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
player->UpdatePvP(true, true);
retval = true;
break;
case NA_SPELL_FLY_SOUTH:
nodes[0] = FlightPathStartNodes[NA_ROOST_S];
nodes[1] = FlightPathEndNodes[NA_ROOST_S];
plr->ActivateTaxiPathTo(nodes);
plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
plr->UpdatePvP(true, true);
player->ActivateTaxiPathTo(nodes);
player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
player->UpdatePvP(true, true);
retval = true;
break;
case NA_SPELL_FLY_WEST:
nodes[0] = FlightPathStartNodes[NA_ROOST_W];
nodes[1] = FlightPathEndNodes[NA_ROOST_W];
plr->ActivateTaxiPathTo(nodes);
plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
plr->UpdatePvP(true, true);
player->ActivateTaxiPathTo(nodes);
player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
player->UpdatePvP(true, true);
retval = true;
break;
case NA_SPELL_FLY_EAST:
nodes[0] = FlightPathStartNodes[NA_ROOST_E];
nodes[1] = FlightPathEndNodes[NA_ROOST_E];
plr->ActivateTaxiPathTo(nodes);
plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
plr->UpdatePvP(true, true);
player->ActivateTaxiPathTo(nodes);
player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
player->UpdatePvP(true, true);
retval = true;
break;
default:
@@ -383,7 +383,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* plr, uint32 spellId, GameObje
int32 count = 10;
uint32 itemid = 24538;
// bomb id count
uint8 msg = plr->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemid, count, &noSpaceForCount);
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemid, count, &noSpaceForCount);
if (msg != EQUIP_ERR_OK) // convert to possible store amount
count -= noSpaceForCount;
@@ -392,11 +392,11 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* plr, uint32 spellId, GameObje
return true;
}
Item* item = plr->StoreNewItem(dest, itemid, true);
Item* item = player->StoreNewItem(dest, itemid, true);
if (count > 0 && item)
{
plr->SendNewItem(item, count, true, false);
player->SendNewItem(item, count, true, false);
}
return true;
@@ -404,9 +404,9 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* plr, uint32 spellId, GameObje
return false;
}
int32 OPvPCapturePointNA::HandleOpenGo(Player* plr, uint64 guid)
int32 OPvPCapturePointNA::HandleOpenGo(Player* player, uint64 guid)
{
int32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid);
int32 retval = OPvPCapturePoint::HandleOpenGo(player, guid);
if (retval >= 0)
{
const go_type * gos = NULL;
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
+8 -8
View File
@@ -267,12 +267,12 @@ class OPvPCapturePointNA : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
bool HandlePlayerEnter(Player* player);
void HandlePlayerLeave(Player* player);
bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject* go);
bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go);
int32 HandleOpenGo(Player* plr, uint64 guid);
int32 HandleOpenGo(Player* player, uint64 guid);
uint32 GetAliveGuardsCount();
@@ -320,16 +320,16 @@ class OutdoorPvPNA : public OutdoorPvP
bool SetupOutdoorPvP();
void HandlePlayerEnterZone(Player* plr, uint32 zone);
void HandlePlayerLeaveZone(Player* plr, uint32 zone);
void HandlePlayerEnterZone(Player* player, uint32 zone);
void HandlePlayerLeaveZone(Player* player, uint32 zone);
bool Update(uint32 diff);
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player* plr);
void SendRemoveWorldStates(Player* player);
void HandleKillImpl(Player* plr, Unit* killed);
void HandleKillImpl(Player* player, Unit* killed);
private:
src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
+34 -34
View File
@@ -41,11 +41,11 @@ void OutdoorPvPSI::FillInitialWorldStates(WorldPacket &data)
data << SI_SILITHYST_MAX << SI_MAX_RESOURCES;
}
void OutdoorPvPSI::SendRemoveWorldStates(Player* plr)
void OutdoorPvPSI::SendRemoveWorldStates(Player* player)
{
plr->SendUpdateWorldState(SI_GATHERED_A, 0);
plr->SendUpdateWorldState(SI_GATHERED_H, 0);
plr->SendUpdateWorldState(SI_SILITHYST_MAX, 0);
player->SendUpdateWorldState(SI_GATHERED_A, 0);
player->SendUpdateWorldState(SI_GATHERED_H, 0);
player->SendUpdateWorldState(SI_SILITHYST_MAX, 0);
}
void OutdoorPvPSI::UpdateWorldState()
@@ -67,29 +67,29 @@ bool OutdoorPvPSI::Update(uint32 /*diff*/)
return false;
}
void OutdoorPvPSI::HandlePlayerEnterZone(Player* plr, uint32 zone)
void OutdoorPvPSI::HandlePlayerEnterZone(Player* player, uint32 zone)
{
if (plr->GetTeam() == m_LastController)
plr->CastSpell(plr, SI_CENARION_FAVOR, true);
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
if (player->GetTeam() == m_LastController)
player->CastSpell(player, SI_CENARION_FAVOR, true);
OutdoorPvP::HandlePlayerEnterZone(player, zone);
}
void OutdoorPvPSI::HandlePlayerLeaveZone(Player* plr, uint32 zone)
void OutdoorPvPSI::HandlePlayerLeaveZone(Player* player, uint32 zone)
{
// remove buffs
plr->RemoveAurasDueToSpell(SI_CENARION_FAVOR);
OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
player->RemoveAurasDueToSpell(SI_CENARION_FAVOR);
OutdoorPvP::HandlePlayerLeaveZone(player, zone);
}
bool OutdoorPvPSI::HandleAreaTrigger(Player* plr, uint32 trigger)
bool OutdoorPvPSI::HandleAreaTrigger(Player* player, uint32 trigger)
{
switch(trigger)
{
case SI_AREATRIGGER_A:
if (plr->GetTeam() == ALLIANCE && plr->HasAura(SI_SILITHYST_FLAG))
if (player->GetTeam() == ALLIANCE && player->HasAura(SI_SILITHYST_FLAG))
{
// remove aura
plr->RemoveAurasDueToSpell(SI_SILITHYST_FLAG);
player->RemoveAurasDueToSpell(SI_SILITHYST_FLAG);
++ m_Gathered_A;
if (m_Gathered_A >= SI_MAX_RESOURCES)
{
@@ -101,20 +101,20 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player* plr, uint32 trigger)
}
UpdateWorldState();
// reward player
plr->CastSpell(plr, SI_TRACES_OF_SILITHYST, true);
player->CastSpell(player, SI_TRACES_OF_SILITHYST, true);
// add 19 honor
plr->RewardHonor(NULL, 1, 19);
player->RewardHonor(NULL, 1, 19);
// add 20 cenarion circle repu
plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20);
player->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20);
// complete quest
plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_A, 0);
player->KilledMonsterCredit(SI_TURNIN_QUEST_CM_A, 0);
}
return true;
case SI_AREATRIGGER_H:
if (plr->GetTeam() == HORDE && plr->HasAura(SI_SILITHYST_FLAG))
if (player->GetTeam() == HORDE && player->HasAura(SI_SILITHYST_FLAG))
{
// remove aura
plr->RemoveAurasDueToSpell(SI_SILITHYST_FLAG);
player->RemoveAurasDueToSpell(SI_SILITHYST_FLAG);
++ m_Gathered_H;
if (m_Gathered_H >= SI_MAX_RESOURCES)
{
@@ -126,25 +126,25 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player* plr, uint32 trigger)
}
UpdateWorldState();
// reward player
plr->CastSpell(plr, SI_TRACES_OF_SILITHYST, true);
player->CastSpell(player, SI_TRACES_OF_SILITHYST, true);
// add 19 honor
plr->RewardHonor(NULL, 1, 19);
player->RewardHonor(NULL, 1, 19);
// add 20 cenarion circle repu
plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20);
player->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20);
// complete quest
plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_H, 0);
player->KilledMonsterCredit(SI_TURNIN_QUEST_CM_H, 0);
}
return true;
}
return false;
}
bool OutdoorPvPSI::HandleDropFlag(Player* plr, uint32 spellId)
bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId)
{
if (spellId == SI_SILITHYST_FLAG)
{
// if it was dropped away from the player's turn-in point, then create a silithyst mound, if it was dropped near the areatrigger, then it was dispelled by the outdoorpvp, so do nothing
switch(plr->GetTeam())
switch(player->GetTeam())
{
case ALLIANCE:
{
@@ -152,18 +152,18 @@ bool OutdoorPvPSI::HandleDropFlag(Player* plr, uint32 spellId)
if (atEntry)
{
// 5.0f is safe-distance
if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius)
if (player->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius)
{
// he dropped it further, summon mound
GameObject* go = new GameObject;
Map * map = plr->GetMap();
Map * map = player->GetMap();
if (!map)
{
delete go;
return true;
}
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(), plr->GetPositionY(), plr->GetPositionZ(), plr->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY))
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, player->GetPhaseMask(), player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY))
{
delete go;
}
@@ -182,17 +182,17 @@ bool OutdoorPvPSI::HandleDropFlag(Player* plr, uint32 spellId)
if (atEntry)
{
// 5.0f is safe-distance
if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius)
if (player->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius)
{
// he dropped it further, summon mound
GameObject* go = new GameObject;
Map * map = plr->GetMap();
Map * map = player->GetMap();
if (!map)
{
delete go;
return true;
}
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, plr->GetPhaseMask() , plr->GetPositionX(), plr->GetPositionY(), plr->GetPositionZ(), plr->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY))
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, player->GetPhaseMask() , player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY))
{
delete go;
}
@@ -211,11 +211,11 @@ bool OutdoorPvPSI::HandleDropFlag(Player* plr, uint32 spellId)
return false;
}
bool OutdoorPvPSI::HandleCustomSpell(Player* plr, uint32 spellId, GameObject* go)
bool OutdoorPvPSI::HandleCustomSpell(Player* player, uint32 spellId, GameObject* go)
{
if (!go || spellId != SI_SILITHYST_FLAG_GO_SPELL)
return false;
plr->CastSpell(plr, SI_SILITHYST_FLAG, true);
player->CastSpell(player, SI_SILITHYST_FLAG, true);
if (go->GetGOInfo()->entry == SI_SILITHYST_MOUND)
{
// despawn go
src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
+6 -6
View File
@@ -59,20 +59,20 @@ class OutdoorPvPSI : public OutdoorPvP
bool SetupOutdoorPvP();
void HandlePlayerEnterZone(Player* plr, uint32 zone);
void HandlePlayerLeaveZone(Player* plr, uint32 zone);
void HandlePlayerEnterZone(Player* player, uint32 zone);
void HandlePlayerLeaveZone(Player* player, uint32 zone);
bool Update(uint32 diff);
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player* plr);
void SendRemoveWorldStates(Player* player);
bool HandleAreaTrigger(Player* plr, uint32 trigger);
bool HandleAreaTrigger(Player* player, uint32 trigger);
bool HandleDropFlag(Player* plr, uint32 spellId);
bool HandleDropFlag(Player* player, uint32 spellId);
bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject* go);
bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go);
void UpdateWorldState();
src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
+32 -32
View File
@@ -67,29 +67,29 @@ void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data)
}
}
void OutdoorPvPTF::SendRemoveWorldStates(Player* plr)
void OutdoorPvPTF::SendRemoveWorldStates(Player* player)
{
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, uint32(0));
player->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, uint32(0));
player->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, uint32(0));
player->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_H, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_A, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0));
player->SendUpdateWorldState(TF_UI_TOWER_COUNT_H, uint32(0));
player->SendUpdateWorldState(TF_UI_TOWER_COUNT_A, uint32(0));
player->SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS, uint32(0));
player->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT, uint32(0));
player->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT, uint32(0));
player->SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0));
plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0));
player->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0));
player->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0));
player->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0));
for (int i = 0; i < TF_TOWER_NUM; ++i)
{
plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n), uint32(0));
plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].h), uint32(0));
plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].a), uint32(0));
player->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n), uint32(0));
player->SendUpdateWorldState(uint32(TFTowerWorldStates[i].h), uint32(0));
player->SendUpdateWorldState(uint32(TFTowerWorldStates[i].a), uint32(0));
}
}
@@ -100,23 +100,23 @@ void OPvPCapturePointTF::UpdateTowerState()
m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a), uint32(bool(m_TowerState & TF_TOWERSTATE_A)));
}
bool OPvPCapturePointTF::HandlePlayerEnter(Player* plr)
bool OPvPCapturePointTF::HandlePlayerEnter(Player* player)
{
if (OPvPCapturePoint::HandlePlayerEnter(plr))
if (OPvPCapturePoint::HandlePlayerEnter(player))
{
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, 1);
player->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, 1);
uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f);
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, phase);
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, m_neutralValuePct);
player->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, phase);
player->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, m_neutralValuePct);
return true;
}
return false;
}
void OPvPCapturePointTF::HandlePlayerLeave(Player* plr)
void OPvPCapturePointTF::HandlePlayerLeave(Player* player)
{
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(plr);
player->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, 0);
OPvPCapturePoint::HandlePlayerLeave(player);
}
bool OutdoorPvPTF::Update(uint32 diff)
@@ -186,26 +186,26 @@ bool OutdoorPvPTF::Update(uint32 diff)
return changed;
}
void OutdoorPvPTF::HandlePlayerEnterZone(Player* plr, uint32 zone)
void OutdoorPvPTF::HandlePlayerEnterZone(Player* player, uint32 zone)
{
if (plr->GetTeam() == ALLIANCE)
if (player->GetTeam() == ALLIANCE)
{
if (m_AllianceTowersControlled >= TF_TOWER_NUM)
plr->CastSpell(plr, TF_CAPTURE_BUFF, true);
player->CastSpell(player, TF_CAPTURE_BUFF, true);
}
else
{
if (m_HordeTowersControlled >= TF_TOWER_NUM)
plr->CastSpell(plr, TF_CAPTURE_BUFF, true);
player->CastSpell(player, TF_CAPTURE_BUFF, true);
}
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
OutdoorPvP::HandlePlayerEnterZone(player, zone);
}
void OutdoorPvPTF::HandlePlayerLeaveZone(Player* plr, uint32 zone)
void OutdoorPvPTF::HandlePlayerLeaveZone(Player* player, uint32 zone)
{
// remove buffs
plr->RemoveAurasDueToSpell(TF_CAPTURE_BUFF);
OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
player->RemoveAurasDueToSpell(TF_CAPTURE_BUFF);
OutdoorPvP::HandlePlayerLeaveZone(player, zone);
}
bool OutdoorPvPTF::SetupOutdoorPvP()
src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
+5 -5
View File
@@ -136,8 +136,8 @@ class OPvPCapturePointTF : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
bool HandlePlayerEnter(Player* player);
void HandlePlayerLeave(Player* player);
void UpdateTowerState();
@@ -158,14 +158,14 @@ class OutdoorPvPTF : public OutdoorPvP
bool SetupOutdoorPvP();
void HandlePlayerEnterZone(Player* plr, uint32 zone);
void HandlePlayerLeaveZone(Player* plr, uint32 zone);
void HandlePlayerEnterZone(Player* player, uint32 zone);
void HandlePlayerLeaveZone(Player* player, uint32 zone);
bool Update(uint32 diff);
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player* plr);
void SendRemoveWorldStates(Player* player);
private:
src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
+66 -66
View File
@@ -52,23 +52,23 @@ void OPvPCapturePointZM_Beacon::UpdateTowerState()
m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H)));
}
bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player* plr)
bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player* player)
{
if (OPvPCapturePoint::HandlePlayerEnter(plr))
if (OPvPCapturePoint::HandlePlayerEnter(player))
{
plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_disp, 1);
player->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_disp, 1);
uint32 phase = (uint32)ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f);
plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_pos, phase);
plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_n, m_neutralValuePct);
player->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_pos, phase);
player->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_n, m_neutralValuePct);
return true;
}
return false;
}
void OPvPCapturePointZM_Beacon::HandlePlayerLeave(Player* plr)
void OPvPCapturePointZM_Beacon::HandlePlayerLeave(Player* player)
{
plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_disp, 0);
OPvPCapturePoint::HandlePlayerLeave(plr);
player->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_disp, 0);
OPvPCapturePoint::HandlePlayerLeave(player);
}
void OPvPCapturePointZM_Beacon::ChangeState()
@@ -139,29 +139,29 @@ bool OutdoorPvPZM::Update(uint32 diff)
return changed;
}
void OutdoorPvPZM::HandlePlayerEnterZone(Player* plr, uint32 zone)
void OutdoorPvPZM::HandlePlayerEnterZone(Player* player, uint32 zone)
{
if (plr->GetTeam() == ALLIANCE)
if (player->GetTeam() == ALLIANCE)
{
if (m_GraveYard->m_GraveYardState & ZM_GRAVEYARD_A)
plr->CastSpell(plr, ZM_CAPTURE_BUFF, true);
player->CastSpell(player, ZM_CAPTURE_BUFF, true);
}
else
{
if (m_GraveYard->m_GraveYardState & ZM_GRAVEYARD_H)
plr->CastSpell(plr, ZM_CAPTURE_BUFF, true);
player->CastSpell(player, ZM_CAPTURE_BUFF, true);
}
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
OutdoorPvP::HandlePlayerEnterZone(player, zone);
}
void OutdoorPvPZM::HandlePlayerLeaveZone(Player* plr, uint32 zone)
void OutdoorPvPZM::HandlePlayerLeaveZone(Player* player, uint32 zone)
{
// remove buffs
plr->RemoveAurasDueToSpell(ZM_CAPTURE_BUFF);
player->RemoveAurasDueToSpell(ZM_CAPTURE_BUFF);
// remove flag
plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A);
plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H);
OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
player->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A);
player->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H);
OutdoorPvP::HandlePlayerLeaveZone(player, zone);
}
OutdoorPvPZM::OutdoorPvPZM()
@@ -190,15 +190,15 @@ bool OutdoorPvPZM::SetupOutdoorPvP()
return true;
}
void OutdoorPvPZM::HandleKillImpl(Player* plr, Unit* killed)
void OutdoorPvPZM::HandleKillImpl(Player* player, Unit* killed)
{
if (killed->GetTypeId() != TYPEID_PLAYER)
return;
if (plr->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE)
plr->CastSpell(plr, ZM_AlliancePlayerKillReward, true);
else if (plr->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE)
plr->CastSpell(plr, ZM_HordePlayerKillReward, true);
if (player->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE)
player->CastSpell(player, ZM_AlliancePlayerKillReward, true);
else if (player->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE)
player->CastSpell(player, ZM_HordePlayerKillReward, true);
}
bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/)
@@ -208,12 +208,12 @@ bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/)
return retval;
}
int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* plr, uint64 guid)
int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* player, uint64 guid)
{
int32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid);
int32 retval = OPvPCapturePoint::HandleOpenGo(player, guid);
if (retval >= 0)
{
if (plr->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveYardState != ZM_GRAVEYARD_A)
if (player->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveYardState != ZM_GRAVEYARD_A)
{
if (m_GraveYardState == ZM_GRAVEYARD_H)
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H));
@@ -223,10 +223,10 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* plr, uint64 guid)
sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE); // rem gy
sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE, false); // add gy
m_PvP->TeamApplyBuff(TEAM_ALLIANCE, ZM_CAPTURE_BUFF);
plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A);
player->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A);
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A));
}
else if (plr->HasAura(ZM_BATTLE_STANDARD_H) && m_GraveYardState != ZM_GRAVEYARD_H)
else if (player->HasAura(ZM_BATTLE_STANDARD_H) && m_GraveYardState != ZM_GRAVEYARD_H)
{
if (m_GraveYardState == ZM_GRAVEYARD_A)
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A));
@@ -236,7 +236,7 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* plr, uint64 guid)
sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE); // rem gy
sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE, false); // add gy
m_PvP->TeamApplyBuff(TEAM_HORDE, ZM_CAPTURE_BUFF);
plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H);
player->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H);
sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H));
}
UpdateTowerState();
@@ -326,21 +326,21 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction)
UpdateTowerState();
}
bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& /*gso*/)
bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player* player, Creature* c, GossipMenuItems const& /*gso*/)
{
uint64 guid = c->GetGUID();
std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid);
if (itr != m_CreatureTypes.end())
{
if (itr->second == ZM_ALLIANCE_FIELD_SCOUT && plr->GetTeam() == ALLIANCE && m_BothControllingFaction == ALLIANCE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_A)
if (itr->second == ZM_ALLIANCE_FIELD_SCOUT && player->GetTeam() == ALLIANCE && m_BothControllingFaction == ALLIANCE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_A)
return true;
else if (itr->second == ZM_HORDE_FIELD_SCOUT && plr->GetTeam() == HORDE && m_BothControllingFaction == HORDE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_H)
else if (itr->second == ZM_HORDE_FIELD_SCOUT && player->GetTeam() == HORDE && m_BothControllingFaction == HORDE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_H)
return true;
}
return false;
}
bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player* plr, uint64 guid, uint32 /*gossipid*/)
bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player* player, uint64 guid, uint32 /*gossipid*/)
{
std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid);
if (itr != m_CreatureTypes.end())
@@ -353,22 +353,22 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player* plr, uint64 guid,
return true;
if (itr->second == ZM_ALLIANCE_FIELD_SCOUT)
{
cr->CastSpell(plr, ZM_BATTLE_STANDARD_A, true);
m_FlagCarrierGUID = plr->GetGUID();
cr->CastSpell(player, ZM_BATTLE_STANDARD_A, true);
m_FlagCarrierGUID = player->GetGUID();
}
else if (itr->second == ZM_HORDE_FIELD_SCOUT)
{
cr->CastSpell(plr, ZM_BATTLE_STANDARD_H, true);
m_FlagCarrierGUID = plr->GetGUID();
cr->CastSpell(player, ZM_BATTLE_STANDARD_H, true);
m_FlagCarrierGUID = player->GetGUID();
}
UpdateTowerState();
plr->PlayerTalkClass->SendCloseGossip();
player->PlayerTalkClass->SendCloseGossip();
return true;
}
return false;
}
bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*plr*/, uint32 spellId)
bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*player*/, uint32 spellId)
{
switch(spellId)
{
@@ -391,34 +391,34 @@ void OutdoorPvPZM::FillInitialWorldStates(WorldPacket &data)
}
}
void OutdoorPvPZM::SendRemoveWorldStates(Player* plr)
void OutdoorPvPZM::SendRemoveWorldStates(Player* player)
{
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_W, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_W, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_E, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_E, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_E, 0);
plr->SendUpdateWorldState(ZM_WORLDSTATE_UNK_1, 1);
plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_N, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_H, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_A, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_N, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_H, 0);
plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_A, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_N, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_H, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_A, 0);
plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, 0);
plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, 0);
plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_N, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_H, 0);
plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_A, 0);
plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY, 0);
plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY, 0);
plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, 0);
plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_W, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_W, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_E, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_E, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_E, 0);
player->SendUpdateWorldState(ZM_WORLDSTATE_UNK_1, 1);
player->SendUpdateWorldState(ZM_UI_TOWER_EAST_N, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_EAST_H, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_EAST_A, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_WEST_N, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_WEST_H, 0);
player->SendUpdateWorldState(ZM_UI_TOWER_WEST_A, 0);
player->SendUpdateWorldState(ZM_MAP_TOWER_EAST_N, 0);
player->SendUpdateWorldState(ZM_MAP_TOWER_EAST_H, 0);
player->SendUpdateWorldState(ZM_MAP_TOWER_EAST_A, 0);
player->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, 0);
player->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, 0);
player->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, 0);
player->SendUpdateWorldState(ZM_MAP_TOWER_WEST_N, 0);
player->SendUpdateWorldState(ZM_MAP_TOWER_WEST_H, 0);
player->SendUpdateWorldState(ZM_MAP_TOWER_WEST_A, 0);
player->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY, 0);
player->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY, 0);
player->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, 0);
player->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, 0);
}
class OutdoorPvP_zangarmarsh : public OutdoorPvPScript
src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
+10 -10
View File
@@ -181,8 +181,8 @@ class OPvPCapturePointZM_Beacon : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
bool HandlePlayerEnter(Player* player);
void HandlePlayerLeave(Player* player);
void UpdateTowerState();
@@ -215,15 +215,15 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint
void UpdateTowerState();
int32 HandleOpenGo(Player* plr, uint64 guid);
int32 HandleOpenGo(Player* player, uint64 guid);
void SetBeaconState(uint32 controlling_team); // not good atm
bool HandleGossipOption(Player* plr, uint64 guid, uint32 gossipid);
bool HandleGossipOption(Player* player, uint64 guid, uint32 gossipid);
bool HandleDropFlag(Player* plr, uint32 spellId);
bool HandleDropFlag(Player* player, uint32 spellId);
bool CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso);
bool CanTalkTo(Player* player, Creature* c, GossipMenuItems const& gso);
private:
@@ -246,16 +246,16 @@ class OutdoorPvPZM : public OutdoorPvP
bool SetupOutdoorPvP();
void HandlePlayerEnterZone(Player* plr, uint32 zone);
void HandlePlayerLeaveZone(Player* plr, uint32 zone);
void HandlePlayerEnterZone(Player* player, uint32 zone);
void HandlePlayerLeaveZone(Player* player, uint32 zone);
bool Update(uint32 diff);
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player* plr);
void SendRemoveWorldStates(Player* player);
void HandleKillImpl(Player* plr, Unit* killed);
void HandleKillImpl(Player* player, Unit* killed);
private: