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;
|
target = owner;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
target = me->getVictim();
|
target = me->getVictim();
|
||||||
if (target && target->GetTypeId() != TYPEID_PLAYER)
|
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);
|
SendLootRoll(newitemGUID, p->GetGUID(), 128, ROLL_PASS, *r);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SendLootStartRoll(60000, pLootedObject->GetMapId(), *r);
|
SendLootStartRoll(60000, pLootedObject->GetMapId(), *r);
|
||||||
|
|
||||||
RollId.push_back(r);
|
RollId.push_back(r);
|
||||||
|
|||||||
+10
-10
@@ -14129,7 +14129,7 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (pQuest->IsWeekly())
|
if (pQuest->IsWeekly())
|
||||||
SetWeeklyQuestStatus(quest_id);
|
SetWeeklyQuestStatus(quest_id);
|
||||||
|
|
||||||
if (!pQuest->IsRepeatable())
|
if (!pQuest->IsRepeatable())
|
||||||
SetQuestStatus(quest_id, QUEST_STATUS_COMPLETE);
|
SetQuestStatus(quest_id, QUEST_STATUS_COMPLETE);
|
||||||
@@ -15492,7 +15492,7 @@ void Player::SetHomebind(WorldLocation const& /*loc*/, uint32 /*area_id*/)
|
|||||||
m_homebindX = GetPositionX();
|
m_homebindX = GetPositionX();
|
||||||
m_homebindY = GetPositionY();
|
m_homebindY = GetPositionY();
|
||||||
m_homebindZ = GetPositionZ();
|
m_homebindZ = GetPositionZ();
|
||||||
|
|
||||||
// update sql homebind
|
// 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'",
|
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());
|
m_homebindMapId, m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ, GetGUIDLow());
|
||||||
@@ -16811,11 +16811,11 @@ void Player::_LoadDailyQuestStatus(QueryResult_AutoPtr result)
|
|||||||
m_DailyQuestChanged = false;
|
m_DailyQuestChanged = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Player::_LoadWeeklyQuestStatus(QueryResult_AutoPtr result)
|
void Player::_LoadWeeklyQuestStatus(QueryResult_AutoPtr result)
|
||||||
{
|
{
|
||||||
m_weeklyquests.clear();
|
m_weeklyquests.clear();
|
||||||
|
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
@@ -16825,9 +16825,9 @@ void Player::_LoadWeeklyQuestStatus(QueryResult_AutoPtr result)
|
|||||||
|
|
||||||
Quest const* pQuest = objmgr.GetQuestTemplate(quest_id);
|
Quest const* pQuest = objmgr.GetQuestTemplate(quest_id);
|
||||||
|
|
||||||
if (!pQuest)
|
if (!pQuest)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
m_weeklyquests.insert(quest_id);
|
m_weeklyquests.insert(quest_id);
|
||||||
|
|
||||||
sLog.outDebug("Weekly quest {%u} cooldown for player (GUID: %u)", quest_id, GetGUIDLow());
|
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
|
// check if stats should only be saved on logout
|
||||||
// save stats can be out of transaction
|
// save stats can be out of transaction
|
||||||
if (m_session->isLogingOut() || !sWorld.getConfig(CONFIG_STATS_SAVE_ONLY_ON_LOGOUT))
|
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).
|
// save pet (hunter pet level and experience and all type pets health/mana).
|
||||||
if (Pet* pet = GetPet())
|
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_weeklyquests.insert(quest_id);
|
||||||
m_WeeklyQuestChanged = true;
|
m_WeeklyQuestChanged = true;
|
||||||
@@ -20964,7 +20964,7 @@ void Player::ResetWeeklyQuestStatus()
|
|||||||
if (m_weeklyquests.empty())
|
if (m_weeklyquests.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_weeklyquests.clear();
|
m_weeklyquests.clear();
|
||||||
// DB data deleted in caller
|
// DB data deleted in caller
|
||||||
m_WeeklyQuestChanged = false;
|
m_WeeklyQuestChanged = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -518,7 +518,7 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
|
|||||||
if (pAurEff)
|
if (pAurEff)
|
||||||
bonus += (float)pAurEff->GetAmount() / 100.0f;
|
bonus += (float)pAurEff->GetAmount() / 100.0f;
|
||||||
|
|
||||||
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(GetSpellProto())) * bonus;
|
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(GetSpellProto())) * bonus;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SPELLFAMILY_PALADIN:
|
case SPELLFAMILY_PALADIN:
|
||||||
|
|||||||
@@ -1842,7 +1842,7 @@ void SpellMgr::LoadSpellLearnSkills()
|
|||||||
dbc_node.value = dbc_node.step * 75;
|
dbc_node.value = dbc_node.step * 75;
|
||||||
dbc_node.maxvalue = 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);
|
SpellLearnSkillNode const* db_node = GetSpellLearnSkill(spell);
|
||||||
|
|
||||||
mSpellLearnSkills[spell] = dbc_node;
|
mSpellLearnSkills[spell] = dbc_node;
|
||||||
|
|||||||
+16
-16
@@ -1850,9 +1850,9 @@ void World::Update(uint32 diff)
|
|||||||
|
|
||||||
if (m_gameTime > m_NextWeeklyQuestReset)
|
if (m_gameTime > m_NextWeeklyQuestReset)
|
||||||
{
|
{
|
||||||
ResetWeeklyQuests();
|
ResetWeeklyQuests();
|
||||||
m_NextWeeklyQuestReset += WEEK;
|
m_NextWeeklyQuestReset += WEEK;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <ul><li> Handle auctions when the timer has passed
|
/// <ul><li> Handle auctions when the timer has passed
|
||||||
if (m_timers[WUPDATE_AUCTIONS].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));
|
time_t wtime = uint64(sWorld.getWorldState(WS_WEEKLY_QUEST_RESET_TIME));
|
||||||
if (!wtime)
|
if (!wtime)
|
||||||
{
|
{
|
||||||
m_NextWeeklyQuestReset = time_t(m_gameTime + WEEK);
|
m_NextWeeklyQuestReset = time_t(m_gameTime + WEEK);
|
||||||
sWorld.setWorldState(WS_WEEKLY_QUEST_RESET_TIME, uint64(m_NextWeeklyQuestReset));
|
sWorld.setWorldState(WS_WEEKLY_QUEST_RESET_TIME, uint64(m_NextWeeklyQuestReset));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// move to just before if need
|
// move to just before if need
|
||||||
time_t cur = time(NULL);
|
time_t cur = time(NULL);
|
||||||
if (m_NextWeeklyQuestReset < cur)
|
if (m_NextWeeklyQuestReset < cur)
|
||||||
m_NextWeeklyQuestReset += WEEK * ((cur - m_NextWeeklyQuestReset) / WEEK);
|
m_NextWeeklyQuestReset += WEEK * ((cur - m_NextWeeklyQuestReset) / WEEK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void World::InitDailyQuestResetTime()
|
void World::InitDailyQuestResetTime()
|
||||||
{
|
{
|
||||||
@@ -2570,16 +2570,16 @@ void World::UpdateAllowedSecurity()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void World::ResetWeeklyQuests()
|
void World::ResetWeeklyQuests()
|
||||||
{
|
{
|
||||||
CharacterDatabase.Execute("DELETE FROM character_queststatus_weekly");
|
CharacterDatabase.Execute("DELETE FROM character_queststatus_weekly");
|
||||||
for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
|
for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
|
||||||
if (itr->second->GetPlayer())
|
if (itr->second->GetPlayer())
|
||||||
itr->second->GetPlayer()->ResetWeeklyQuestStatus();
|
itr->second->GetPlayer()->ResetWeeklyQuestStatus();
|
||||||
|
|
||||||
m_NextWeeklyQuestReset = time_t(m_NextWeeklyQuestReset + WEEK);
|
m_NextWeeklyQuestReset = time_t(m_NextWeeklyQuestReset + WEEK);
|
||||||
sWorld.setWorldState(WS_WEEKLY_QUEST_RESET_TIME, uint64(m_NextWeeklyQuestReset));
|
sWorld.setWorldState(WS_WEEKLY_QUEST_RESET_TIME, uint64(m_NextWeeklyQuestReset));
|
||||||
}
|
}
|
||||||
|
|
||||||
void World::SetPlayerLimit(int32 limit, bool /*needUpdate*/)
|
void World::SetPlayerLimit(int32 limit, bool /*needUpdate*/)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ struct boss_krik_thirAI : public ScriptedAI
|
|||||||
pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_NARJIL));
|
pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_NARJIL));
|
||||||
if (!pAdd || !pAdd->isAlive())
|
if (!pAdd || !pAdd->isAlive())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE);
|
pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -648,7 +648,7 @@ enum eNesingwaryTrapper
|
|||||||
};
|
};
|
||||||
|
|
||||||
#define CaribouTrapsNum 15
|
#define CaribouTrapsNum 15
|
||||||
const uint32 CaribouTraps[CaribouTrapsNum] =
|
const uint32 CaribouTraps[CaribouTrapsNum] =
|
||||||
{
|
{
|
||||||
GO_CARIBOU_TRAP_1, GO_CARIBOU_TRAP_2, GO_CARIBOU_TRAP_3, GO_CARIBOU_TRAP_4, GO_CARIBOU_TRAP_5,
|
GO_CARIBOU_TRAP_1, GO_CARIBOU_TRAP_2, GO_CARIBOU_TRAP_3, GO_CARIBOU_TRAP_4, GO_CARIBOU_TRAP_5,
|
||||||
GO_CARIBOU_TRAP_6, GO_CARIBOU_TRAP_7, GO_CARIBOU_TRAP_8, GO_CARIBOU_TRAP_9, GO_CARIBOU_TRAP_10,
|
GO_CARIBOU_TRAP_6, GO_CARIBOU_TRAP_7, GO_CARIBOU_TRAP_8, GO_CARIBOU_TRAP_9, GO_CARIBOU_TRAP_10,
|
||||||
@@ -2084,7 +2084,7 @@ struct npc_trapped_mammoth_calfAI : public ScriptedAI
|
|||||||
|
|
||||||
void MovementInform(uint32 uiType, uint32 /*uiId*/)
|
void MovementInform(uint32 uiType, uint32 /*uiId*/)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (uiType != POINT_MOTION_TYPE)
|
if (uiType != POINT_MOTION_TYPE)
|
||||||
return;
|
return;
|
||||||
me->DisappearAndDie();
|
me->DisappearAndDie();
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ struct npc_warmage_violetstandAI : public Scripted_NoMovementAI
|
|||||||
uiTargetGUID = pOrb->GetGUID();
|
uiTargetGUID = pOrb->GetGUID();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Creature* pOrb = me->GetCreature(*me,uiTargetGUID))
|
if (Creature* pOrb = me->GetCreature(*me,uiTargetGUID))
|
||||||
DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM);
|
DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM);
|
||||||
|
|
||||||
|
|||||||
@@ -243,7 +243,7 @@ struct mob_frozen_orb_stalkerAI : public Scripted_NoMovementAI
|
|||||||
Unit* pToravon = me->GetCreature(*me, pInstance->GetData64(DATA_TORAVON));
|
Unit* pToravon = me->GetCreature(*me, pInstance->GetData64(DATA_TORAVON));
|
||||||
if (!pToravon)
|
if (!pToravon)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
uint8 num_orbs = RAID_MODE(1, 3);
|
uint8 num_orbs = RAID_MODE(1, 3);
|
||||||
for (uint8 i=0; i<num_orbs; ++i)
|
for (uint8 i=0; i<num_orbs; ++i)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1097,7 +1097,7 @@ void AddSC_go_scripts()
|
|||||||
newscript->Name = "go_stillpine_cage";
|
newscript->Name = "go_stillpine_cage";
|
||||||
newscript->pGOHello = &GOHello_go_stillpine_cage;
|
newscript->pGOHello = &GOHello_go_stillpine_cage;
|
||||||
newscript->RegisterSelf();
|
newscript->RegisterSelf();
|
||||||
|
|
||||||
newscript = new Script;
|
newscript = new Script;
|
||||||
newscript->Name = "go_amberpine_outhouse";
|
newscript->Name = "go_amberpine_outhouse";
|
||||||
newscript->pGOHello = &GOHello_go_amberpine_outhouse;
|
newscript->pGOHello = &GOHello_go_amberpine_outhouse;
|
||||||
|
|||||||
@@ -255,7 +255,7 @@ enum ePileFakeFur
|
|||||||
};
|
};
|
||||||
|
|
||||||
#define CaribouTrapsNum 15
|
#define CaribouTrapsNum 15
|
||||||
const uint32 CaribouTraps[CaribouTrapsNum] =
|
const uint32 CaribouTraps[CaribouTrapsNum] =
|
||||||
{
|
{
|
||||||
GO_CARIBOU_TRAP_1, GO_CARIBOU_TRAP_2, GO_CARIBOU_TRAP_3, GO_CARIBOU_TRAP_4, GO_CARIBOU_TRAP_5,
|
GO_CARIBOU_TRAP_1, GO_CARIBOU_TRAP_2, GO_CARIBOU_TRAP_3, GO_CARIBOU_TRAP_4, GO_CARIBOU_TRAP_5,
|
||||||
GO_CARIBOU_TRAP_6, GO_CARIBOU_TRAP_7, GO_CARIBOU_TRAP_8, GO_CARIBOU_TRAP_9, GO_CARIBOU_TRAP_10,
|
GO_CARIBOU_TRAP_6, GO_CARIBOU_TRAP_7, GO_CARIBOU_TRAP_8, GO_CARIBOU_TRAP_9, GO_CARIBOU_TRAP_10,
|
||||||
@@ -383,7 +383,7 @@ bool ItemUse_item_dehta_trap_smasher(Player* pPlayer, Item* /*pItem*/, const Spe
|
|||||||
pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF,0);
|
pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF,0);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2081,7 +2081,7 @@ bool GossipHello_npc_pet_trainer(Player* pPlayer, Creature* pCreature)
|
|||||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
|
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
|
||||||
if (pPlayer->GetPet() && pPlayer->GetPet()->getPetType() == HUNTER_PET)
|
if (pPlayer->GetPet() && pPlayer->GetPet()->getPetType() == HUNTER_PET)
|
||||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
|
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_PET2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
|
||||||
|
|
||||||
pPlayer->PlayerTalkClass->SendGossipMenu(TEXT_ISHUNTER, pCreature->GetGUID());
|
pPlayer->PlayerTalkClass->SendGossipMenu(TEXT_ISHUNTER, pCreature->GetGUID());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user