diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-20 23:44:35 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-20 23:44:35 +0100 |
| commit | 5a324ff0365bc9f059de0b606519efc37561b29b (patch) | |
| tree | c7c46487058f36c1e30b7168a93b020d3e84d29e /src/server/game | |
| parent | 61b0e289dff3f5b6a654f68fb1bbd308ced7f48c (diff) | |
| parent | 542521a026031764ddd98518e7f5bdab91bc0ebb (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Battlefield/Zones/BattlefieldWG.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index 738d82135d2..97807eb989c 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -171,7 +171,7 @@ enum WGGraveyardId BATTLEFIELD_WG_GRAVEYARD_MAX, }; -enum eWGGossipText +enum WGGossipText { BATTLEFIELD_WG_GOSSIPTEXT_GY_NE = -1850501, BATTLEFIELD_WG_GOSSIPTEXT_GY_NW = -1850502, @@ -231,12 +231,14 @@ struct BfWGCoordGY TeamId startcontrol; }; -const uint32 WGQuest[2][6] = { +uint32 const WGQuest[2][6] = +{ { 13186, 13181, 13222, 13538, 13177, 13179 }, { 13185, 13183, 13223, 13539, 13178, 13180 }, }; // 7 in sql, 7 in header -const BfWGCoordGY WGGraveYard[BATTLEFIELD_WG_GRAVEYARD_MAX] = { +BfWGCoordGY const WGGraveYard[BATTLEFIELD_WG_GRAVEYARD_MAX] = +{ { 5104.750f, 2300.940f, 368.579f, 0.733038f, 1329, BATTLEFIELD_WG_GY_WORKSHOP_NE, BATTLEFIELD_WG_GOSSIPTEXT_GY_NE, TEAM_NEUTRAL }, { 5099.120f, 3466.036f, 368.484f, 5.317802f, 1330, BATTLEFIELD_WG_GY_WORKSHOP_NW, BATTLEFIELD_WG_GOSSIPTEXT_GY_NW, TEAM_NEUTRAL }, { 4314.648f, 2408.522f, 392.642f, 6.268125f, 1333, BATTLEFIELD_WG_GY_WORKSHOP_SE, BATTLEFIELD_WG_GOSSIPTEXT_GY_SE, TEAM_NEUTRAL }, |