*Update OutdoorPvP functions. No longer need creature triggers for capture points.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-29 00:18:41 -05:00
parent 1288761fb7
commit bc32144310
27 changed files with 443 additions and 736 deletions
+6 -8
View File
@@ -148,19 +148,17 @@ enum ZM_TowerStateMask{
};
class OutdoorPvPZM;
class OutdoorPvPObjectiveZM_Beacon : public OutdoorPvPObjective
class OPvPCapturePointZM_Beacon : public OPvPCapturePoint
{
friend class OutdoorPvPZM;
public:
OutdoorPvPObjectiveZM_Beacon(OutdoorPvP * pvp, ZM_BeaconType type);
OPvPCapturePointZM_Beacon(OutdoorPvP * pvp, ZM_BeaconType type);
bool Update(uint32 diff);
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player * plr);
void HandlePlayerLeave(Player * plr);
void UpdateTowerState();
protected:
bool HandleCapturePointEvent(Player * plr, uint32 eventId);
protected:
ZM_BeaconType m_TowerType;
uint32 m_TowerState;
@@ -172,11 +170,11 @@ enum ZM_GraveYardState{
ZM_GRAVEYARD_H = 4
};
class OutdoorPvPObjectiveZM_GraveYard : public OutdoorPvPObjective
class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint
{
friend class OutdoorPvPZM;
public:
OutdoorPvPObjectiveZM_GraveYard(OutdoorPvP * pvp);
OPvPCapturePointZM_GraveYard(OutdoorPvP * pvp);
bool Update(uint32 diff);
void FillInitialWorldStates(WorldPacket & data);
void UpdateTowerState();
@@ -194,7 +192,7 @@ protected:
class OutdoorPvPZM : public OutdoorPvP
{
friend class OutdoorPvPObjectiveZM_Beacon;
friend class OPvPCapturePointZM_Beacon;
public:
OutdoorPvPZM();
bool SetupOutdoorPvP();
@@ -205,7 +203,7 @@ public:
void SendRemoveWorldStates(Player * plr);
void HandleKillImpl(Player * plr, Unit * killed);
private:
OutdoorPvPObjectiveZM_GraveYard * m_GraveYard;
OPvPCapturePointZM_GraveYard * m_GraveYard;
uint32 m_AllianceTowersControlled;
uint32 m_HordeTowersControlled;
};