*Cleanup, proper indentation, and remove some wrong/irrelevant comments copied from custom patches..

--HG--
branch : trunk
This commit is contained in:
maximius
2009-12-18 13:41:30 -08:00
parent 89464472a9
commit dc1207139a
30 changed files with 195 additions and 199 deletions
-1
View File
@@ -784,7 +784,6 @@ void BattleGround::EndBattleGround(uint32 winner)
else if(winner)
RewardMark(plr,ITEM_LOSER_COUNT);
plr->SetHealth(plr->GetMaxHealth());
plr->SetPower(POWER_MANA, plr->GetMaxPower(POWER_MANA));
plr->CombatStopWithPets(true);
+1 -2
View File
@@ -70,13 +70,12 @@ void BattleGroundWS::Update(uint32 diff)
if (GetStatus() == STATUS_IN_PROGRESS)
{
if( GetStartTime() >= 25*MINUTE*1000 ) // Òàéìåð òèêàòü íà÷èíàåò ïîñëå 25 ìèíóò
if (GetStartTime() >= 25*MINUTE*IN_MILISECONDS) // Òàéìåð òèêàòü íà÷èíàåò ïîñëå 25 ìèíóò
{
if (GetTeamScore(ALLIANCE) == 0)
{
if (GetTeamScore(HORDE) == 0) // No one scored - result is tie
EndBattleGround(NULL);
else // Horde has more points and thus wins
EndBattleGround(HORDE);
}
-1
View File
@@ -5253,7 +5253,6 @@ void ObjectMgr::LoadAreaTriggerScripts()
sLog.outString( ">> Loaded %u areatrigger scripts", count );
}
// use searched_node for search some known node
uint32 ObjectMgr::GetNearestTaxiNode( float x, float y, float z, uint32 mapid, uint32 team )
{
bool found = false;
-1
View File
@@ -1037,7 +1037,6 @@ int WorldSocket::iSendPartialPacket(WorldPacket& pct)
return 1; // some byte written and packet completed
}
bool WorldSocket::iFlushPacketQueue()
{
WorldPacket *pct;
+2 -2
View File
@@ -348,7 +348,7 @@ public:
template<class type>
inline bool operator < (type & right)
{
for (uint8 i=3; i>0; i--)
for (uint8 i=3; i > 0; --i)
{
if (part[i-1]<right.part[i-1])
return 1;
@@ -361,7 +361,7 @@ public:
template<class type>
inline bool operator < (type & right) const
{
for (uint8 i=3; i>0; i--)
for (uint8 i = 3; i > 0; --i)
{
if (part[i-1]<right.part[i-1])
return 1;