Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly
--HG-- branch : trunk
This commit is contained in:
@@ -818,7 +818,7 @@ void Battleground::EndBattleground(uint32 winner)
|
||||
{
|
||||
if (IsRandom() || BattlegroundMgr::IsBGWeekend(GetTypeID()))
|
||||
UpdatePlayerScore(plr, SCORE_BONUS_HONOR, GetBonusHonorFromKill(loos_kills));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
plr->SetHealth(plr->GetMaxHealth());
|
||||
@@ -1657,7 +1657,7 @@ void Battleground::SendWarningToAll(int32 entry, ...)
|
||||
data << (uint64)0;
|
||||
data << (uint32)0; // 2.1.0
|
||||
data << (uint32)1;
|
||||
data << (uint8)0;
|
||||
data << (uint8)0;
|
||||
data << (uint64)0;
|
||||
data << (uint32)(strlen(msg.c_str())+1);
|
||||
data << msg.c_str();
|
||||
@@ -1754,7 +1754,7 @@ void Battleground::HandleKillPlayer(Player *player, Player *killer)
|
||||
}
|
||||
|
||||
// to be able to remove insignia -- ONLY IN Battlegrounds
|
||||
// give xp only in Battlegrounds
|
||||
// give xp only in Battlegrounds
|
||||
if (!isArena())
|
||||
{
|
||||
player->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
|
||||
@@ -1909,7 +1909,7 @@ void Battleground::RewardXPAtKill(Player* plr, Player* victim)
|
||||
if (victim->getLevel() > gray_level && (!not_gray_member_with_max_level
|
||||
|| not_gray_member_with_max_level->getLevel() < member->getLevel()))
|
||||
not_gray_member_with_max_level = member;
|
||||
}
|
||||
}
|
||||
|
||||
if (member_with_max_level)
|
||||
{
|
||||
@@ -1964,5 +1964,5 @@ void Battleground::RewardXPAtKill(Player* plr, Player* victim)
|
||||
|
||||
if (Pet* pet = plr->GetPet())
|
||||
pet->GivePetXP(xp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -264,7 +264,7 @@ enum BG_OBJECT_DMG_HIT_TYPE
|
||||
BG_OBJECT_DMG_HIT_TYPE_DAMAGED = 1,
|
||||
BG_OBJECT_DMG_HIT_TYPE_JUST_HIGH_DAMAGED = 2,
|
||||
BG_OBJECT_DMG_HIT_TYPE_HIGH_DAMAGED = 3,
|
||||
BG_OBJECT_DMG_HIT_TYPE_JUST_DESTROYED = 4
|
||||
BG_OBJECT_DMG_HIT_TYPE_JUST_DESTROYED = 4
|
||||
};
|
||||
|
||||
enum GroupJoinBattlegroundResult
|
||||
|
||||
@@ -40,7 +40,7 @@ class BattlegroundMgr
|
||||
/* Construction */
|
||||
friend class ACE_Singleton<BattlegroundMgr, ACE_Null_Mutex>;
|
||||
BattlegroundMgr();
|
||||
|
||||
|
||||
public:
|
||||
~BattlegroundMgr();
|
||||
void Update(uint32 diff);
|
||||
|
||||
@@ -402,7 +402,7 @@ void BattlegroundAB::_NodeDeOccupied(uint8 node)
|
||||
if (node >= BG_AB_DYNAMIC_NODES_COUNT)
|
||||
return;
|
||||
|
||||
//remove bonus honor aura trigger creature when node is lost
|
||||
//remove bonus honor aura trigger creature when node is lost
|
||||
if(node < BG_AB_DYNAMIC_NODES_COUNT)//only dynamic nodes, no start points
|
||||
DelCreature(node+7);//NULL checks are in DelCreature! 0-6 spirit guides
|
||||
|
||||
|
||||
@@ -319,7 +319,7 @@ Creature* BattlegroundAV::AddAVCreature(uint16 cinfoid, uint16 type)
|
||||
triggerSpawnID = AV_CPLACE_TRIGGER17;
|
||||
newFaction = 84;
|
||||
}
|
||||
else if (creature->GetEntry() == BG_AV_CreatureInfo[AV_NPC_H_CAPTAIN][0])
|
||||
else if (creature->GetEntry() == BG_AV_CreatureInfo[AV_NPC_H_CAPTAIN][0])
|
||||
{
|
||||
triggerSpawnID = AV_CPLACE_TRIGGER18;
|
||||
newFaction = 83;
|
||||
@@ -335,7 +335,7 @@ Creature* BattlegroundAV::AddAVCreature(uint16 cinfoid, uint16 type)
|
||||
{
|
||||
trigger->setFaction(newFaction);
|
||||
trigger->CastSpell(trigger, SPELL_HONORABLE_DEFENDER_25Y, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return creature;
|
||||
@@ -790,7 +790,7 @@ void BattlegroundAV::DePopulateNode(BG_AV_Nodes node)
|
||||
if (!IsTower(node) && m_BgCreatures[node])
|
||||
DelCreature(node);
|
||||
|
||||
//remove bonus honor aura trigger creature when node is lost
|
||||
//remove bonus honor aura trigger creature when node is lost
|
||||
if(node < BG_AV_NODES_MAX)//fail safe
|
||||
DelCreature(node + 302);//NULL checks are in DelCreature! 0-302 spirit guides
|
||||
}
|
||||
|
||||
@@ -612,7 +612,7 @@ enum BG_AV_CreaturePlace
|
||||
AV_CPLACE_TRIGGER13 = 314,
|
||||
AV_CPLACE_TRIGGER14 = 315,
|
||||
AV_CPLACE_TRIGGER15 = 316,
|
||||
|
||||
|
||||
//boss,captain triggers
|
||||
AV_CPLACE_TRIGGER16 = 317,
|
||||
AV_CPLACE_TRIGGER17 = 318,
|
||||
|
||||
@@ -696,7 +696,7 @@ void BattlegroundEY::EventTeamLostPoint(Player *Source, uint32 Point)
|
||||
UpdatePointsIcons(Team, Point);
|
||||
UpdatePointsCount(Team);
|
||||
|
||||
//remove bonus honor aura trigger creature when node is lost
|
||||
//remove bonus honor aura trigger creature when node is lost
|
||||
if (Point < EY_POINTS_MAX)
|
||||
DelCreature(Point + 6);//NULL checks are in DelCreature! 0-5 spirit guides
|
||||
}
|
||||
|
||||
@@ -155,7 +155,7 @@ bool BattlegroundSA::ResetObjs()
|
||||
GetBGObject(i)->SetUInt32Value(GAMEOBJECT_FACTION, atF);
|
||||
}
|
||||
|
||||
for (uint8 i = BG_SA_PORTAL_DEFFENDER_BLUE; i < BG_SA_BOMB; i++)
|
||||
for (uint8 i = BG_SA_PORTAL_DEFFENDER_BLUE; i < BG_SA_BOMB; i++)
|
||||
{
|
||||
AddObject(i, BG_SA_ObjEntries[i],
|
||||
BG_SA_ObjSpawnlocs[i][0], BG_SA_ObjSpawnlocs[i][1],
|
||||
@@ -260,7 +260,7 @@ void BattlegroundSA::Update(uint32 diff)
|
||||
InitSecondRound = false;
|
||||
SendMessageToAll(LANG_BG_SA_ROUND_TWO_ONE_MINUTE, CHAT_MSG_BG_SYSTEM_NEUTRAL);
|
||||
}
|
||||
}else
|
||||
}else
|
||||
{
|
||||
UpdateWaitTimer -= diff;
|
||||
return;
|
||||
@@ -277,7 +277,7 @@ void BattlegroundSA::Update(uint32 diff)
|
||||
TotalTime = 0;
|
||||
ToggleTimer();
|
||||
DemolisherStartState(false);
|
||||
status = BG_SA_ROUND_ONE;
|
||||
status = BG_SA_ROUND_ONE;
|
||||
}
|
||||
if (TotalTime >= BG_SA_BOAT_START)
|
||||
StartShips();
|
||||
@@ -287,7 +287,7 @@ void BattlegroundSA::Update(uint32 diff)
|
||||
{
|
||||
if (RoundScores[0].time<BG_SA_ROUNDLENGTH)
|
||||
BG_SA_ENDROUNDTIME = RoundScores[0].time;
|
||||
else
|
||||
else
|
||||
BG_SA_ENDROUNDTIME = BG_SA_ROUNDLENGTH;
|
||||
|
||||
if (TotalTime >= 60000)
|
||||
@@ -319,7 +319,7 @@ void BattlegroundSA::Update(uint32 diff)
|
||||
RoundScores[0].time = BG_SA_ROUNDLENGTH;
|
||||
TotalTime = 0;
|
||||
status = BG_SA_SECOND_WARMUP;
|
||||
attackers = (attackers == TEAM_ALLIANCE) ? TEAM_HORDE : TEAM_ALLIANCE;
|
||||
attackers = (attackers == TEAM_ALLIANCE) ? TEAM_HORDE : TEAM_ALLIANCE;
|
||||
UpdateWaitTimer = 5000;
|
||||
SignaledRoundTwo = false;
|
||||
SignaledRoundTwoHalfMin = false;
|
||||
@@ -511,7 +511,7 @@ void BattlegroundSA::EventPlayerDamagedGO(Player* plr, GameObject* go, uint8 hit
|
||||
GateStatus[i] = BG_SA_GATE_DAMAGED;
|
||||
uint32 uws = GetWorldStateFromGateID(i);
|
||||
if (uws)
|
||||
UpdateWorldState(uws, GateStatus[i]);
|
||||
UpdateWorldState(uws, GateStatus[i]);
|
||||
break;
|
||||
}
|
||||
case BG_OBJECT_DMG_HIT_TYPE_HIGH_DAMAGED:
|
||||
@@ -586,7 +586,7 @@ void BattlegroundSA::DestroyGate(Player* pl, GameObject* /*go*/, uint32 destroye
|
||||
GateStatus[i] = BG_SA_GATE_DESTROYED;
|
||||
uint32 uws = GetWorldStateFromGateID(i);
|
||||
if (uws)
|
||||
UpdateWorldState(uws, GateStatus[i]);
|
||||
UpdateWorldState(uws, GateStatus[i]);
|
||||
bool rewardHonor = true;
|
||||
switch(i)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user