diff options
| author | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
| commit | d69198732e65002b53bab3a85779107490fe4dd2 (patch) | |
| tree | e1f4b11f1964cc42ac05c79bdc43eedc1db16866 /src/game/OutdoorPvPNA.cpp | |
| parent | 5d4d9530556eb66940775f12c3cc5f3c115447ca (diff) | |
| parent | c745eba4a1d122b4184b27a982674c86ff193c23 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/OutdoorPvPNA.cpp')
| -rw-r--r-- | src/game/OutdoorPvPNA.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/game/OutdoorPvPNA.cpp b/src/game/OutdoorPvPNA.cpp index d17aa297277..c8134944cc1 100644 --- a/src/game/OutdoorPvPNA.cpp +++ b/src/game/OutdoorPvPNA.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify @@ -160,9 +160,9 @@ void OutdoorPvPObjectiveNA::SpawnGOsForTeam(uint32 team) i == NA_ROOST_W || i == NA_ROOST_N || i == NA_ROOST_E || - i == NA_BOMB_WAGON_S || - i == NA_BOMB_WAGON_W || - i == NA_BOMB_WAGON_N || + i == NA_BOMB_WAGON_S || + i == NA_BOMB_WAGON_W || + i == NA_BOMB_WAGON_N || i == NA_BOMB_WAGON_E ) continue; // roosts and bomb wagons are spawned when someone uses the matching destroyed roost AddObject(i,gos[i].entry,gos[i].map,gos[i].x,gos[i].y,gos[i].z,gos[i].o,gos[i].rot0,gos[i].rot1,gos[i].rot2,gos[i].rot3); @@ -244,7 +244,7 @@ void OutdoorPvPObjectiveNA::HandlePlayerLeave(Player *plr) OutdoorPvPObjective::HandlePlayerLeave(plr); } -OutdoorPvPObjectiveNA::OutdoorPvPObjectiveNA(OutdoorPvP *pvp) : +OutdoorPvPObjectiveNA::OutdoorPvPObjectiveNA(OutdoorPvP *pvp) : OutdoorPvPObjective(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFaction(0), m_HalaaState(HALAA_N), m_WyvernStateSouth(0), m_WyvernStateNorth(0), m_WyvernStateWest(0), m_WyvernStateEast(0), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME) @@ -336,7 +336,7 @@ void OutdoorPvPObjectiveNA::FillInitialWorldStates(WorldPacket &data) data << NA_MAP_HALAA_NEU_A << uint32(bool(m_HalaaState & HALAA_N_A)); data << NA_MAP_HALAA_NEU_H << uint32(bool(m_HalaaState & HALAA_N_H)); data << NA_MAP_HALAA_HORDE << uint32(bool(m_HalaaState & HALAA_H)); - data << NA_MAP_HALAA_ALLIANCE << uint32(bool(m_HalaaState & HALAA_A)); + data << NA_MAP_HALAA_ALLIANCE << uint32(bool(m_HalaaState & HALAA_A)); } void OutdoorPvPNA::SendRemoveWorldStates(Player *plr) @@ -368,7 +368,7 @@ void OutdoorPvPNA::SendRemoveWorldStates(Player *plr) plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_A,0); plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_H,0); plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE,0); + plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE,0); } bool OutdoorPvPNA::Update(uint32 diff) @@ -425,7 +425,7 @@ bool OutdoorPvPObjectiveNA::HandleCustomSpell(Player * plr, uint32 spellId, Game uint32 noSpaceForCount = 0; // check space and find places - ItemPosCountVec dest; + ItemPosCountVec dest; int32 count = 10; uint32 itemid = 24538; |