Core/Battleground:

* Fix typo in commit ddd25ce716
* Fix codestyle
This commit is contained in:
Vincent-Michael
2012-04-27 16:24:16 +02:00
parent 51656d7e60
commit 8f19d00509
@@ -52,20 +52,20 @@ enum BG_SA_GateState
enum BG_SA_EventIdGate enum BG_SA_EventIdGate
{ {
BG_SA_EVENT_GREEN_GATE_DAMAGED = 19041,
BG_SA_EVENT_GREEN_GATE_DESTROYED = 19046,
BG_SA_EVENT_BLUE_GATE_DAMAGED = 19040, BG_SA_EVENT_BLUE_GATE_DAMAGED = 19040,
BG_SA_EVENT_BLUE_GATE_DESTROYED = 19045, BG_SA_EVENT_BLUE_GATE_DESTROYED = 19045,
BG_SA_EVENT_GREEN_GATE_DAMAGED = 19041,
BG_SA_EVENT_GREEN_GATE_DESTROYED = 19046,
BG_SA_EVENT_RED_GATE_DAMAGED = 19042, BG_SA_EVENT_RED_GATE_DAMAGED = 19042,
BG_SA_EVENT_RED_GATE_DESTROYED = 19047, BG_SA_EVENT_RED_GATE_DESTROYED = 19047,
BG_SA_EVENT_PURPLE_GATE_DAMAGED = 19048, BG_SA_EVENT_PURPLE_GATE_DAMAGED = 19043,
BG_SA_EVENT_PURPLE_GATE_DESTROYED = 19043, BG_SA_EVENT_PURPLE_GATE_DESTROYED = 19048,
BG_SA_EVENT_YELLOW_GATE_DAMAGED = 19049, BG_SA_EVENT_YELLOW_GATE_DAMAGED = 19044,
BG_SA_EVENT_YELLOW_GATE_DESTROYED = 19044, BG_SA_EVENT_YELLOW_GATE_DESTROYED = 19049,
BG_SA_EVENT_ANCIENT_GATE_DAMAGED = 19836, BG_SA_EVENT_ANCIENT_GATE_DAMAGED = 19836,
BG_SA_EVENT_ANCIENT_GATE_DESTROYED = 19837 BG_SA_EVENT_ANCIENT_GATE_DESTROYED = 19837
@@ -149,7 +149,7 @@ enum BG_SA_Boat
BG_SA_BOAT_TWO_A = 193185, BG_SA_BOAT_TWO_A = 193185,
}; };
const uint32 BG_SA_NpcEntries[BG_SA_MAXNPC] = uint32 const BG_SA_NpcEntries[BG_SA_MAXNPC] =
{ {
NPC_ANTI_PERSONNAL_CANNON, NPC_ANTI_PERSONNAL_CANNON,
NPC_ANTI_PERSONNAL_CANNON, NPC_ANTI_PERSONNAL_CANNON,
@@ -177,7 +177,7 @@ const uint32 BG_SA_NpcEntries[BG_SA_MAXNPC] =
NPC_GORGRIL_RIGSPARK NPC_GORGRIL_RIGSPARK
}; };
const float BG_SA_NpcSpawnlocs[BG_SA_MAXNPC + BG_SA_DEMOLISHER_AMOUNT][4] = float const BG_SA_NpcSpawnlocs[BG_SA_MAXNPC + BG_SA_DEMOLISHER_AMOUNT][4] =
{ {
// Cannons // Cannons
{ 1436.429f, 110.05f, 41.407f, 5.4f }, { 1436.429f, 110.05f, 41.407f, 5.4f },
@@ -195,7 +195,7 @@ const float BG_SA_NpcSpawnlocs[BG_SA_MAXNPC + BG_SA_DEMOLISHER_AMOUNT][4] =
{ 1575.562500f, -158.421875f, 5.024450f, 2.129302f}, { 1575.562500f, -158.421875f, 5.024450f, 2.129302f},
{ 1618.047729f, 61.424641f, 7.248210f, 3.979351f}, { 1618.047729f, 61.424641f, 7.248210f, 3.979351f},
{ 1575.103149f, 98.873344f, 2.830360f, 3.752458f}, { 1575.103149f, 98.873344f, 2.830360f, 3.752458f},
//trigger // Triggers
{ 1453.49f, -250.453f, 30.896f, 4.2883f}, { 1453.49f, -250.453f, 30.896f, 4.2883f},
{ 1377.05f, 97.036f, 30.8605f, 2.46539f}, { 1377.05f, 97.036f, 30.8605f, 2.46539f},
{ 1186.05f, 58.8048f, 56.5491f, 2.75992f}, { 1186.05f, 58.8048f, 56.5491f, 2.75992f},
@@ -242,7 +242,7 @@ enum BG_SA_Objects
BG_SA_MAXOBJ = BG_SA_BOMB+68 BG_SA_MAXOBJ = BG_SA_BOMB+68
}; };
const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] = float const BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] =
{ {
{ 1411.57f, 108.163f, 28.692f, 5.441f }, { 1411.57f, 108.163f, 28.692f, 5.441f },
{ 1055.452f, -108.1f, 82.134f, 0.034f }, { 1055.452f, -108.1f, 82.134f, 0.034f },
@@ -358,7 +358,7 @@ const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] =
* to get horde ones. * to get horde ones.
*/ */
const uint32 BG_SA_ObjEntries[BG_SA_MAXOBJ + BG_SA_FLAG_AMOUNT] = uint32 const BG_SA_ObjEntries[BG_SA_MAXOBJ + BG_SA_FLAG_AMOUNT] =
{ {
190722, 190722,
190727, 190727,
@@ -388,7 +388,7 @@ const uint32 BG_SA_ObjEntries[BG_SA_MAXOBJ + BG_SA_FLAG_AMOUNT] =
190753 190753
}; };
const uint32 BG_SA_Factions[2] = uint32 const BG_SA_Factions[2] =
{ {
1732, 1732,
1735, 1735,
@@ -413,7 +413,7 @@ const uint32 BG_SA_GYEntries[BG_SA_MAX_GY] =
1348, 1348,
}; };
const float BG_SA_GYOrientation[BG_SA_MAX_GY] = float const BG_SA_GYOrientation[BG_SA_MAX_GY] =
{ {
6.202f, 6.202f,
1.926f, // right capturable GY 1.926f, // right capturable GY