diff options
Diffstat (limited to 'src/game/BattleGroundSA.cpp')
| -rw-r--r-- | src/game/BattleGroundSA.cpp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp index 33e05ece62f..ec39710a2c6 100644 --- a/src/game/BattleGroundSA.cpp +++ b/src/game/BattleGroundSA.cpp @@ -76,9 +76,9 @@ bool BattleGroundSA::ResetObjs() for(uint8 i = 0; i < BG_SA_CENTRAL_FLAG; i++) { if(!AddObject(i,BG_SA_ObjEntries[i], - BG_SA_ObjSpawnlocs[i][0],BG_SA_ObjSpawnlocs[i][1], - BG_SA_ObjSpawnlocs[i][2],BG_SA_ObjSpawnlocs[i][3], - 0,0,0,0,RESPAWN_ONE_DAY)) + BG_SA_ObjSpawnlocs[i][0],BG_SA_ObjSpawnlocs[i][1], + BG_SA_ObjSpawnlocs[i][2],BG_SA_ObjSpawnlocs[i][3], + 0,0,0,0,RESPAWN_ONE_DAY)) return false; } @@ -87,8 +87,8 @@ bool BattleGroundSA::ResetObjs() for(uint8 i = 0; i < BG_SA_NPC_SPARKLIGHT; i++) { if(!AddCreature(BG_SA_NpcEntries[i], i, (attackers == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE), - BG_SA_NpcSpawnlocs[i][0],BG_SA_NpcSpawnlocs[i][1], - BG_SA_NpcSpawnlocs[i][2],BG_SA_NpcSpawnlocs[i][3])) + BG_SA_NpcSpawnlocs[i][0],BG_SA_NpcSpawnlocs[i][1], + BG_SA_NpcSpawnlocs[i][2],BG_SA_NpcSpawnlocs[i][3])) return false; } @@ -122,22 +122,22 @@ bool BattleGroundSA::ResetObjs() sg = sWorldSafeLocsStore.LookupEntry(BG_SA_GYEntries[i]); if(!sg) - { + { sLog.outError("SOTA: Can't find GY entry %u",BG_SA_GYEntries[i]); return false; - } + } if(i == BG_SA_BEACH_GY) - { + { GraveyardStatus[i] = attackers; AddSpiritGuide(i + BG_SA_MAXNPC, sg->x, sg->y, sg->z, BG_SA_GYOrientation[i], ((attackers == TEAM_HORDE )? HORDE : ALLIANCE)); - } + } else - { + { GraveyardStatus[i] = ((attackers == TEAM_HORDE )? TEAM_ALLIANCE : TEAM_HORDE); if(!AddSpiritGuide(i + BG_SA_MAXNPC, sg->x, sg->y, sg->z, BG_SA_GYOrientation[i], ((attackers == TEAM_HORDE )? ALLIANCE : HORDE) )) sLog.outError("SOTA: couldn't spawn GY: %u",i); - } + } } //GY capture points @@ -214,11 +214,11 @@ void BattleGroundSA::StartShips() if(p->GetTeamId() != attackers) continue; - UpdateData data; - WorldPacket pkt; - GetBGObject(i)->BuildValuesUpdateBlockForPlayer(&data, p); - data.BuildPacket(&pkt); - p->GetSession()->SendPacket(&pkt); + UpdateData data; + WorldPacket pkt; + GetBGObject(i)->BuildValuesUpdateBlockForPlayer(&data, p); + data.BuildPacket(&pkt); + p->GetSession()->SendPacket(&pkt); } } } @@ -234,11 +234,11 @@ void BattleGroundSA::Update(uint32 diff) { if(TotalTime >= BG_SA_WARMUPLENGTH) { - TotalTime = 0; - ToggleTimer(); - status = (status == BG_SA_WARMUP) ? BG_SA_ROUND_ONE : BG_SA_ROUND_TWO; + TotalTime = 0; + ToggleTimer(); + status = (status == BG_SA_WARMUP) ? BG_SA_ROUND_ONE : BG_SA_ROUND_TWO; } - if(TotalTime >= BG_SA_BOAT_START) + if(TotalTime >= BG_SA_BOAT_START) StartShips(); return; } @@ -263,9 +263,9 @@ void BattleGroundSA::Update(uint32 diff) { if(TotalTime >= BG_SA_ROUNDLENGTH) { - RoundScores[1].time = TotalTime; - RoundScores[1].winner = (attackers == TEAM_ALLIANCE) ? TEAM_HORDE : TEAM_ALLIANCE; - + RoundScores[1].time = TotalTime; + RoundScores[1].winner = (attackers == TEAM_ALLIANCE) ? TEAM_HORDE : TEAM_ALLIANCE; + if (RoundScores[0].time == RoundScores[1].time) EndBattleGround(NULL); else if(RoundScores[0].time < RoundScores[1].time) @@ -339,12 +339,12 @@ void BattleGroundSA::AddPlayer(Player *plr) if(plr->GetTeamId() == attackers) { plr->CastSpell(plr,12438,true);//Without this player falls before boat loads... - + if(urand(0,1)) plr->TeleportTo(607, 2682.936f, -830.368f, 50.0f, 2.895f, 0); else plr->TeleportTo(607, 2577.003f, 980.261f, 50.0f, 0.807f, 0); - + } else plr->TeleportTo(607, 1209.7f, -65.16f, 70.1f, 0.0f, 0); @@ -408,11 +408,11 @@ void BattleGroundSA::TeleportPlayers() if(plr->GetTeamId() == attackers) { plr->CastSpell(plr,12438,true); //Without this player falls before boat loads... - + if(urand(0,1)) plr->TeleportTo(607, 2682.936f, -830.368f, 50.0f, 2.895f, 0); else - plr->TeleportTo(607, 2577.003f, 980.261f, 50.0f, 0.807f, 0); + plr->TeleportTo(607, 2577.003f, 980.261f, 50.0f, 0.807f, 0); } else plr->TeleportTo(607, 1209.7f, -65.16f, 70.1f, 0.0f, 0); @@ -468,14 +468,14 @@ void BattleGroundSA::OverrideGunFaction() for(uint8 i = BG_SA_GUN_1; i <= BG_SA_GUN_10;i++) { if(Creature* gun = GetBGCreature(i)) - gun->setFaction(BG_SA_Factions[attackers? TEAM_ALLIANCE : TEAM_HORDE]); - } + gun->setFaction(BG_SA_Factions[attackers? TEAM_ALLIANCE : TEAM_HORDE]); + } for(uint8 i = BG_SA_DEMOLISHER_1; i <= BG_SA_DEMOLISHER_4;i++) - { + { if(Creature* dem = GetBGCreature(i)) dem->setFaction(BG_SA_Factions[attackers]); - } + } } void BattleGroundSA::DestroyGate(uint32 i, Player* pl) @@ -496,24 +496,24 @@ void BattleGroundSA::DestroyGate(uint32 i, Player* pl) break; case 1: uws = BG_SA_YELLOW_GATEWS; - break; - case 2: + break; + case 2: uws = BG_SA_BLUE_GATEWS; - break; - case 3: - uws = BG_SA_RED_GATEWS; - break; - case 4: - uws = BG_SA_PURPLE_GATEWS; - break; - case 5: - uws = BG_SA_ANCIENT_GATEWS; - break; - default: - ASSERT(false); - break; - } - + break; + case 3: + uws = BG_SA_RED_GATEWS; + break; + case 4: + uws = BG_SA_PURPLE_GATEWS; + break; + case 5: + uws = BG_SA_ANCIENT_GATEWS; + break; + default: + ASSERT(false); + break; + } + if(i < 5) DelObject(i+9); UpdateWorldState(uws, GateStatus[i]); @@ -599,8 +599,8 @@ void BattleGroundSA::CaptureGraveyard(BG_SA_Graveyards i) SpawnBGObject(BG_SA_LEFT_FLAG,RESPAWN_ONE_DAY); npc = BG_SA_NPC_RIGSPARK; AddCreature(BG_SA_NpcEntries[npc], npc, attackers, - BG_SA_NpcSpawnlocs[npc][0], BG_SA_NpcSpawnlocs[npc][1], - BG_SA_NpcSpawnlocs[npc][2], BG_SA_NpcSpawnlocs[npc][3]); + BG_SA_NpcSpawnlocs[npc][0], BG_SA_NpcSpawnlocs[npc][1], + BG_SA_NpcSpawnlocs[npc][2], BG_SA_NpcSpawnlocs[npc][3]); UpdateWorldState(BG_SA_LEFT_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE? 1:0)); UpdateWorldState(BG_SA_LEFT_GY_HORDE, (GraveyardStatus[i] == TEAM_ALLIANCE? 0:1)); break; @@ -608,8 +608,8 @@ void BattleGroundSA::CaptureGraveyard(BG_SA_Graveyards i) SpawnBGObject(BG_SA_RIGHT_FLAG, RESPAWN_ONE_DAY); npc = BG_SA_NPC_SPARKLIGHT; AddCreature(BG_SA_NpcEntries[npc], npc, attackers, - BG_SA_NpcSpawnlocs[npc][0], BG_SA_NpcSpawnlocs[npc][1], - BG_SA_NpcSpawnlocs[npc][2], BG_SA_NpcSpawnlocs[npc][3]); + BG_SA_NpcSpawnlocs[npc][0], BG_SA_NpcSpawnlocs[npc][1], + BG_SA_NpcSpawnlocs[npc][2], BG_SA_NpcSpawnlocs[npc][3]); UpdateWorldState(BG_SA_RIGHT_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE? 1:0)); UpdateWorldState(BG_SA_RIGHT_GY_HORDE, (GraveyardStatus[i] == TEAM_ALLIANCE? 0:1)); break; @@ -650,8 +650,8 @@ void BattleGroundSA::EventPlayerUsedGO(Player* Source, GameObject* object) EndBattleGround(RoundScores[0].winner == TEAM_ALLIANCE ? ALLIANCE : HORDE); else EndBattleGround(RoundScores[1].winner == TEAM_ALLIANCE ? ALLIANCE : HORDE); - } - } + } + } } } |
