*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk
This commit is contained in:
@@ -1,23 +1,16 @@
|
||||
#ifndef OUTDOOR_PVP_TF_
|
||||
#define OUTDOOR_PVP_TF_
|
||||
|
||||
#include "OutdoorPvPImpl.h"
|
||||
|
||||
const uint32 OutdoorPvPTFBuffZonesNum = 5;
|
||||
|
||||
const uint32 OutdoorPvPTFBuffZones[OutdoorPvPTFBuffZonesNum] = { 3519 /*Terokkar Forest*/, 3791 /*Sethekk Halls*/, 3789 /*Shadow Labyrinth*/, 3792 /*Mana-Tombs*/, 3790 /*Auchenai Crypts*/ };
|
||||
|
||||
// locked for 6 hours after capture
|
||||
const uint32 TF_LOCK_TIME = 3600 * 6 * 1000;
|
||||
// update lock timer every 1/4 minute (overkill, but this way it's sure the timer won't "jump" 2 minutes at once.)
|
||||
const uint32 TF_LOCK_TIME_UPDATE = 15000;
|
||||
|
||||
// blessing of auchindoun
|
||||
#define TF_CAPTURE_BUFF 33377
|
||||
|
||||
const uint32 TF_ALLY_QUEST = 11505;
|
||||
const uint32 TF_HORDE_QUEST = 11506;
|
||||
|
||||
enum OutdoorPvPTF_TowerType{
|
||||
TF_TOWER_NW = 0,
|
||||
TF_TOWER_N,
|
||||
@@ -26,7 +19,6 @@ enum OutdoorPvPTF_TowerType{
|
||||
TF_TOWER_S,
|
||||
TF_TOWER_NUM
|
||||
};
|
||||
|
||||
const go_type TFCapturePoints[TF_TOWER_NUM] = {
|
||||
{183104,530,-3081.65,5335.03,17.1853,-2.14675,0,0,0.878817,-0.477159},
|
||||
{183411,530,-2939.9,4788.73,18.987,2.77507,0,0,0.983255,0.182236},
|
||||
@@ -34,13 +26,11 @@ const go_type TFCapturePoints[TF_TOWER_NUM] = {
|
||||
{183413,530,-3603.31,4529.15,20.9077,0.994838,0,0,0.477159,0.878817},
|
||||
{183414,530,-3812.37,4899.3,17.7249,0.087266,0,0,0.043619,0.999048}
|
||||
};
|
||||
|
||||
struct tf_tower_world_state{
|
||||
uint32 n;
|
||||
uint32 h;
|
||||
uint32 a;
|
||||
};
|
||||
|
||||
const tf_tower_world_state TFTowerWorldStates[TF_TOWER_NUM] = {
|
||||
{0xa79,0xa7a,0xa7b},
|
||||
{0xa7e,0xa7d,0xa7c},
|
||||
@@ -48,20 +38,15 @@ const tf_tower_world_state TFTowerWorldStates[TF_TOWER_NUM] = {
|
||||
{0xa88,0xa87,0xa86},
|
||||
{0xa85,0xa84,0xa83}
|
||||
};
|
||||
|
||||
const uint32 TFTowerPlayerEnterEvents[TF_TOWER_NUM] = {12226, 12497, 12486, 12499, 12501};
|
||||
|
||||
const uint32 TFTowerPlayerLeaveEvents[TF_TOWER_NUM] = {12225, 12496, 12487, 12498, 12500};
|
||||
|
||||
enum TFWorldStates{
|
||||
TF_UI_TOWER_SLIDER_POS = 0xa41,
|
||||
TF_UI_TOWER_SLIDER_N = 0xa40,
|
||||
TF_UI_TOWER_SLIDER_DISPLAY = 0xa3f,
|
||||
|
||||
TF_UI_TOWER_COUNT_H = 0xa3e,
|
||||
TF_UI_TOWER_COUNT_A = 0xa3d,
|
||||
TF_UI_TOWERS_CONTROLLED_DISPLAY = 0xa3c,
|
||||
|
||||
TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT = 0x9d0,
|
||||
TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT = 0x9ce,
|
||||
TF_UI_LOCKED_TIME_HOURS = 0x9cd,
|
||||
@@ -69,13 +54,11 @@ enum TFWorldStates{
|
||||
TF_UI_LOCKED_DISPLAY_HORDE = 0xad0,
|
||||
TF_UI_LOCKED_DISPLAY_ALLIANCE = 0xacf
|
||||
};
|
||||
|
||||
enum TFTowerStates {
|
||||
TF_TOWERSTATE_N = 1,
|
||||
TF_TOWERSTATE_H = 2,
|
||||
TF_TOWERSTATE_A = 4
|
||||
};
|
||||
|
||||
class OPvPCapturePointTF : public OPvPCapturePoint
|
||||
{
|
||||
public:
|
||||
@@ -92,7 +75,6 @@ protected:
|
||||
OutdoorPvPTF_TowerType m_TowerType;
|
||||
uint32 m_TowerState;
|
||||
};
|
||||
|
||||
class OutdoorPvPTF : public OutdoorPvP
|
||||
{
|
||||
friend class OPvPCapturePointTF;
|
||||
@@ -112,6 +94,5 @@ private:
|
||||
uint32 m_HordeTowersControlled;
|
||||
uint32 hours_left, second_digit, first_digit;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user