Random minor code cleanup

This commit is contained in:
unknown
2011-09-29 22:35:00 +04:00
parent 18aad847e1
commit 8acf07dbab
14 changed files with 12 additions and 41 deletions
@@ -506,11 +506,9 @@ void AchievementMgr::SaveToDB(SQLTransaction& trans)
iter->second.changed = false;
}
if (need_execute)
ssdel << ')';
if (need_execute)
{
ssdel << ')';
trans->Append(ssdel.str().c_str());
trans->Append(ssins.str().c_str());
}
@@ -907,8 +907,7 @@ bool BattlegroundMgr::IsArenaType(BattlegroundTypeId bgTypeId)
bgTypeId == BATTLEGROUND_NA ||
bgTypeId == BATTLEGROUND_DS ||
bgTypeId == BATTLEGROUND_RV ||
bgTypeId == BATTLEGROUND_RL ||
bgTypeId == BATTLEGROUND_DS);
bgTypeId == BATTLEGROUND_RL);
}
BattlegroundQueueTypeId BattlegroundMgr::BGQueueTypeId(BattlegroundTypeId bgTypeId, uint8 arenaType)
@@ -1540,11 +1540,8 @@ void GameObject::Use(Unit* user)
switch (info->entry)
{
case 179785: // Silverwing Flag
// check if it's correct bg
if (bg->IsRandom() ? bg->GetTypeID(true) : bg->GetTypeID(false) == BATTLEGROUND_WS)
bg->EventPlayerClickedOnFlag(player, this);
break;
case 179786: // Warsong Flag
// check if it's correct bg
if (bg->IsRandom() ? bg->GetTypeID(true) : bg->GetTypeID(false) == BATTLEGROUND_WS)
bg->EventPlayerClickedOnFlag(player, this);
break;
@@ -9057,11 +9057,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
case 3698:
case 3702:
case 3968:
NumberOfFields = 11;
break;
case 4378:
NumberOfFields = 11;
break;
case 3703:
NumberOfFields = 11;
break;
@@ -9072,8 +9068,6 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
NumberOfFields = 28;
break;
case 4812: // Icecrown Citadel
NumberOfFields = 13;
break;
case 4100: // The Culling of Stratholme
NumberOfFields = 13;
break;
+1 -1
View File
@@ -199,7 +199,7 @@ bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clicke
if (questStart)
{
// not in expected required quest state
if (((!questStartCanActive || !playerClicker->IsActiveQuest(questStart)) && !playerClicker->GetQuestRewardStatus(questStart)))
if ((!questStartCanActive || !playerClicker->IsActiveQuest(questStart)) && !playerClicker->GetQuestRewardStatus(questStart))
return false;
}