Code Style: Remove trailing spaces and tab to spaces
--HG-- branch : trunk
This commit is contained in:
@@ -374,7 +374,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
|
||||
target = owner;
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
target = me->getVictim();
|
||||
if (target && target->GetTypeId() != TYPEID_PLAYER)
|
||||
|
||||
+1
-1
@@ -648,7 +648,7 @@ void Group::GroupLoot(Loot *loot, WorldObject* pLootedObject)
|
||||
SendLootRoll(newitemGUID, p->GetGUID(), 128, ROLL_PASS, *r);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
SendLootStartRoll(60000, pLootedObject->GetMapId(), *r);
|
||||
|
||||
RollId.push_back(r);
|
||||
|
||||
+10
-10
@@ -14129,7 +14129,7 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
|
||||
}
|
||||
|
||||
if (pQuest->IsWeekly())
|
||||
SetWeeklyQuestStatus(quest_id);
|
||||
SetWeeklyQuestStatus(quest_id);
|
||||
|
||||
if (!pQuest->IsRepeatable())
|
||||
SetQuestStatus(quest_id, QUEST_STATUS_COMPLETE);
|
||||
@@ -15492,7 +15492,7 @@ void Player::SetHomebind(WorldLocation const& /*loc*/, uint32 /*area_id*/)
|
||||
m_homebindX = GetPositionX();
|
||||
m_homebindY = GetPositionY();
|
||||
m_homebindZ = GetPositionZ();
|
||||
|
||||
|
||||
// update sql homebind
|
||||
CharacterDatabase.PExecute("UPDATE character_homebind SET map = '%u', zone = '%u', position_x = '%f', position_y = '%f', position_z = '%f' WHERE guid = '%u'",
|
||||
m_homebindMapId, m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ, GetGUIDLow());
|
||||
@@ -16811,11 +16811,11 @@ void Player::_LoadDailyQuestStatus(QueryResult_AutoPtr result)
|
||||
m_DailyQuestChanged = false;
|
||||
}
|
||||
|
||||
void Player::_LoadWeeklyQuestStatus(QueryResult_AutoPtr result)
|
||||
void Player::_LoadWeeklyQuestStatus(QueryResult_AutoPtr result)
|
||||
{
|
||||
m_weeklyquests.clear();
|
||||
|
||||
if (result)
|
||||
if (result)
|
||||
{
|
||||
do
|
||||
{
|
||||
@@ -16825,9 +16825,9 @@ void Player::_LoadWeeklyQuestStatus(QueryResult_AutoPtr result)
|
||||
|
||||
Quest const* pQuest = objmgr.GetQuestTemplate(quest_id);
|
||||
|
||||
if (!pQuest)
|
||||
continue;
|
||||
|
||||
if (!pQuest)
|
||||
continue;
|
||||
|
||||
m_weeklyquests.insert(quest_id);
|
||||
|
||||
sLog.outDebug("Weekly quest {%u} cooldown for player (GUID: %u)", quest_id, GetGUIDLow());
|
||||
@@ -17473,7 +17473,7 @@ void Player::SaveToDB()
|
||||
// check if stats should only be saved on logout
|
||||
// save stats can be out of transaction
|
||||
if (m_session->isLogingOut() || !sWorld.getConfig(CONFIG_STATS_SAVE_ONLY_ON_LOGOUT))
|
||||
_SaveStats();
|
||||
_SaveStats();
|
||||
|
||||
// save pet (hunter pet level and experience and all type pets health/mana).
|
||||
if (Pet* pet = GetPet())
|
||||
@@ -20943,7 +20943,7 @@ void Player::SetDailyQuestStatus(uint32 quest_id)
|
||||
}
|
||||
|
||||
|
||||
void Player::SetWeeklyQuestStatus(uint32 quest_id)
|
||||
void Player::SetWeeklyQuestStatus(uint32 quest_id)
|
||||
{
|
||||
m_weeklyquests.insert(quest_id);
|
||||
m_WeeklyQuestChanged = true;
|
||||
@@ -20964,7 +20964,7 @@ void Player::ResetWeeklyQuestStatus()
|
||||
if (m_weeklyquests.empty())
|
||||
return;
|
||||
|
||||
m_weeklyquests.clear();
|
||||
m_weeklyquests.clear();
|
||||
// DB data deleted in caller
|
||||
m_WeeklyQuestChanged = false;
|
||||
}
|
||||
|
||||
@@ -518,7 +518,7 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
|
||||
if (pAurEff)
|
||||
bonus += (float)pAurEff->GetAmount() / 100.0f;
|
||||
|
||||
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(GetSpellProto())) * bonus;
|
||||
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(GetSpellProto())) * bonus;
|
||||
}
|
||||
break;
|
||||
case SPELLFAMILY_PALADIN:
|
||||
|
||||
@@ -1842,7 +1842,7 @@ void SpellMgr::LoadSpellLearnSkills()
|
||||
dbc_node.value = dbc_node.step * 75;
|
||||
dbc_node.maxvalue = dbc_node.step * 75;
|
||||
|
||||
// FIXME: db_node not used... remove it?
|
||||
// FIXME: db_node not used... remove it?
|
||||
SpellLearnSkillNode const* db_node = GetSpellLearnSkill(spell);
|
||||
|
||||
mSpellLearnSkills[spell] = dbc_node;
|
||||
|
||||
+16
-16
@@ -1850,9 +1850,9 @@ void World::Update(uint32 diff)
|
||||
|
||||
if (m_gameTime > m_NextWeeklyQuestReset)
|
||||
{
|
||||
ResetWeeklyQuests();
|
||||
ResetWeeklyQuests();
|
||||
m_NextWeeklyQuestReset += WEEK;
|
||||
}
|
||||
}
|
||||
|
||||
/// <ul><li> Handle auctions when the timer has passed
|
||||
if (m_timers[WUPDATE_AUCTIONS].Passed())
|
||||
@@ -2496,22 +2496,22 @@ void World::_UpdateRealmCharCount(QueryResult_AutoPtr resultCharCount, uint32 ac
|
||||
}
|
||||
}
|
||||
|
||||
void World::InitWeeklyQuestResetTime()
|
||||
void World::InitWeeklyQuestResetTime()
|
||||
{
|
||||
time_t wtime = uint64(sWorld.getWorldState(WS_WEEKLY_QUEST_RESET_TIME));
|
||||
if (!wtime)
|
||||
{
|
||||
{
|
||||
m_NextWeeklyQuestReset = time_t(m_gameTime + WEEK);
|
||||
sWorld.setWorldState(WS_WEEKLY_QUEST_RESET_TIME, uint64(m_NextWeeklyQuestReset));
|
||||
}
|
||||
else
|
||||
{
|
||||
// move to just before if need
|
||||
time_t cur = time(NULL);
|
||||
else
|
||||
{
|
||||
// move to just before if need
|
||||
time_t cur = time(NULL);
|
||||
if (m_NextWeeklyQuestReset < cur)
|
||||
m_NextWeeklyQuestReset += WEEK * ((cur - m_NextWeeklyQuestReset) / WEEK);
|
||||
}
|
||||
}
|
||||
m_NextWeeklyQuestReset += WEEK * ((cur - m_NextWeeklyQuestReset) / WEEK);
|
||||
}
|
||||
}
|
||||
|
||||
void World::InitDailyQuestResetTime()
|
||||
{
|
||||
@@ -2570,16 +2570,16 @@ void World::UpdateAllowedSecurity()
|
||||
}
|
||||
}
|
||||
|
||||
void World::ResetWeeklyQuests()
|
||||
{
|
||||
void World::ResetWeeklyQuests()
|
||||
{
|
||||
CharacterDatabase.Execute("DELETE FROM character_queststatus_weekly");
|
||||
for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
|
||||
if (itr->second->GetPlayer())
|
||||
for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
|
||||
if (itr->second->GetPlayer())
|
||||
itr->second->GetPlayer()->ResetWeeklyQuestStatus();
|
||||
|
||||
m_NextWeeklyQuestReset = time_t(m_NextWeeklyQuestReset + WEEK);
|
||||
sWorld.setWorldState(WS_WEEKLY_QUEST_RESET_TIME, uint64(m_NextWeeklyQuestReset));
|
||||
}
|
||||
}
|
||||
|
||||
void World::SetPlayerLimit(int32 limit, bool /*needUpdate*/)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user