aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp7
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPHP.h2
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp7
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPNA.h2
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp8
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPSI.h2
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp8
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPTF.h2
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp8
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPZM.h2
10 files changed, 20 insertions, 28 deletions
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
index 68bcef12d02..1cca54645c5 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
@@ -45,7 +45,7 @@ OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP* pvp, OutdoorPvPHPTowerType ty
SetCapturePointData(go->GetEntry());
}
-OutdoorPvPHP::OutdoorPvPHP() : m_towerFlagSpawnIds()
+OutdoorPvPHP::OutdoorPvPHP(Map* map) : OutdoorPvP(map), m_towerFlagSpawnIds()
{
m_TypeId = OUTDOOR_PVP_HP;
m_AllianceTowersControlled = 0;
@@ -56,7 +56,6 @@ bool OutdoorPvPHP::SetupOutdoorPvP()
{
m_AllianceTowersControlled = 0;
m_HordeTowersControlled = 0;
- SetMapFromZone(OutdoorPvPHPBuffZones[0]);
// add the zones affected by the pvp buff
for (uint32 i = 0; i < OutdoorPvPHPBuffZonesNum; ++i)
@@ -304,9 +303,9 @@ class OutdoorPvP_hellfire_peninsula : public OutdoorPvPScript
public:
OutdoorPvP_hellfire_peninsula() : OutdoorPvPScript("outdoorpvp_hp") { }
- OutdoorPvP* GetOutdoorPvP() const override
+ OutdoorPvP* GetOutdoorPvP(Map* map) const override
{
- return new OutdoorPvPHP();
+ return new OutdoorPvPHP(map);
}
};
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
index 4c9ee6bc278..69b847c1107 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
@@ -71,7 +71,7 @@ class OPvPCapturePointHP : public OPvPCapturePoint
class OutdoorPvPHP : public OutdoorPvP
{
public:
- OutdoorPvPHP();
+ OutdoorPvPHP(Map* map);
bool SetupOutdoorPvP() override;
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
index a719a60e84c..953cfe26d27 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
@@ -37,7 +37,7 @@ uint32 const FLIGHT_NODES_NUM = 4;
uint32 const FlightPathStartNodes[FLIGHT_NODES_NUM] = { 103, 105, 107, 109 };
uint32 const FlightPathEndNodes[FLIGHT_NODES_NUM] = { 104, 106, 108, 110 };
-OutdoorPvPNA::OutdoorPvPNA()
+OutdoorPvPNA::OutdoorPvPNA(Map* map) : OutdoorPvP(map)
{
m_TypeId = OUTDOOR_PVP_NA;
m_obj = nullptr;
@@ -137,7 +137,6 @@ bool OutdoorPvPNA::SetupOutdoorPvP()
{
// m_TypeId = OUTDOOR_PVP_NA; _MUST_ be set in ctor, because of spawns cleanup
// add the zones affected by the pvp buff
- SetMapFromZone(NA_BUFF_ZONE);
RegisterZone(NA_BUFF_ZONE);
// halaa
@@ -482,9 +481,9 @@ class OutdoorPvP_nagrand : public OutdoorPvPScript
public:
OutdoorPvP_nagrand() : OutdoorPvPScript("outdoorpvp_na") { }
- OutdoorPvP* GetOutdoorPvP() const override
+ OutdoorPvP* GetOutdoorPvP(Map* map) const override
{
- return new OutdoorPvPNA();
+ return new OutdoorPvPNA(map);
}
};
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
index 211cf5014ea..aff8e4c88fa 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
@@ -148,7 +148,7 @@ class OPvPCapturePointNA : public OPvPCapturePoint
class OutdoorPvPNA : public OutdoorPvP
{
public:
- OutdoorPvPNA();
+ OutdoorPvPNA(Map* map);
void OnGameObjectCreate(GameObject* go) override;
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
index a4c3a15c64e..f625cc8dd88 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
@@ -37,7 +37,7 @@ uint32 const SI_SILITHYST_MOUND = 181597;
uint8 const OutdoorPvPSIBuffZonesNum = 3;
uint32 const OutdoorPvPSIBuffZones[OutdoorPvPSIBuffZonesNum] = { 1377, 3428, 3429 };
-OutdoorPvPSI::OutdoorPvPSI()
+OutdoorPvPSI::OutdoorPvPSI(Map* map) : OutdoorPvP(map)
{
m_TypeId = OUTDOOR_PVP_SI;
m_LastController = 0;
@@ -57,8 +57,6 @@ void OutdoorPvPSI::SendRemoveWorldStates(Player* player)
bool OutdoorPvPSI::SetupOutdoorPvP()
{
- SetMapFromZone(OutdoorPvPSIBuffZones[0]);
-
for (uint8 i = 0; i < OutdoorPvPSIBuffZonesNum; ++i)
RegisterZone(OutdoorPvPSIBuffZones[i]);
@@ -196,9 +194,9 @@ class OutdoorPvP_silithus : public OutdoorPvPScript
public:
OutdoorPvP_silithus() : OutdoorPvPScript("outdoorpvp_si") { }
- OutdoorPvP* GetOutdoorPvP() const override
+ OutdoorPvP* GetOutdoorPvP(Map* map) const override
{
- return new OutdoorPvPSI();
+ return new OutdoorPvPSI(map);
}
};
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
index 61ef6435743..71debd9012b 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
@@ -38,7 +38,7 @@ enum SI_WorldStates
class OutdoorPvPSI : public OutdoorPvP
{
public:
- OutdoorPvPSI();
+ OutdoorPvPSI(Map* map);
bool SetupOutdoorPvP() override;
void HandlePlayerEnterZone(Player* player, uint32 zone) override;
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
index 4dba5934a48..9ef73f70db8 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
@@ -81,7 +81,7 @@ uint32 const TFTowerPlayerLeaveEvents[TF_TOWER_NUM] =
};
*/
-OutdoorPvPTF::OutdoorPvPTF()
+OutdoorPvPTF::OutdoorPvPTF(Map* map) : OutdoorPvP(map)
{
m_TypeId = OUTDOOR_PVP_TF;
m_IsLocked = false;
@@ -262,8 +262,6 @@ bool OutdoorPvPTF::SetupOutdoorPvP()
second_digit = 0;
first_digit = 0;
- SetMapFromZone(OutdoorPvPTFBuffZones[0]);
-
// add the zones affected by the pvp buff
for (uint8 i = 0; i < OutdoorPvPTFBuffZonesNum; ++i)
RegisterZone(OutdoorPvPTFBuffZones[i]);
@@ -379,9 +377,9 @@ class OutdoorPvP_terokkar_forest : public OutdoorPvPScript
public:
OutdoorPvP_terokkar_forest() : OutdoorPvPScript("outdoorpvp_tf") { }
- OutdoorPvP* GetOutdoorPvP() const override
+ OutdoorPvP* GetOutdoorPvP(Map* map) const override
{
- return new OutdoorPvPTF();
+ return new OutdoorPvPTF(map);
}
};
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
index e7b7e13268c..e938877dc16 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
@@ -79,7 +79,7 @@ class OPvPCapturePointTF : public OPvPCapturePoint
class OutdoorPvPTF : public OutdoorPvP
{
public:
- OutdoorPvPTF();
+ OutdoorPvPTF(Map* map);
bool SetupOutdoorPvP() override;
void OnGameObjectCreate(GameObject* go) override;
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
index 82698d807bb..6534c86bfeb 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
@@ -171,7 +171,7 @@ void OutdoorPvPZM::HandlePlayerLeaveZone(Player* player, uint32 zone)
OutdoorPvP::HandlePlayerLeaveZone(player, zone);
}
-OutdoorPvPZM::OutdoorPvPZM()
+OutdoorPvPZM::OutdoorPvPZM(Map* map) : OutdoorPvP(map)
{
m_TypeId = OUTDOOR_PVP_ZM;
m_Graveyard = nullptr;
@@ -184,8 +184,6 @@ bool OutdoorPvPZM::SetupOutdoorPvP()
m_AllianceTowersControlled = 0;
m_HordeTowersControlled = 0;
- SetMapFromZone(OutdoorPvPZMBuffZones[0]);
-
// add the zones affected by the pvp buff
for (uint8 i = 0; i < OutdoorPvPZMBuffZonesNum; ++i)
RegisterZone(OutdoorPvPZMBuffZones[i]);
@@ -443,9 +441,9 @@ class OutdoorPvP_zangarmarsh : public OutdoorPvPScript
public:
OutdoorPvP_zangarmarsh() : OutdoorPvPScript("outdoorpvp_zm") { }
- OutdoorPvP* GetOutdoorPvP() const override
+ OutdoorPvP* GetOutdoorPvP(Map* map) const override
{
- return new OutdoorPvPZM();
+ return new OutdoorPvPZM(map);
}
};
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
index 84e4e81108b..7ef63cc0064 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
@@ -140,7 +140,7 @@ class OPvPCapturePointZM_Graveyard : public OPvPCapturePoint
class OutdoorPvPZM : public OutdoorPvP
{
public:
- OutdoorPvPZM();
+ OutdoorPvPZM(Map* map);
bool SetupOutdoorPvP() override;
void OnGameObjectCreate(GameObject* go) override;