diff options
author | Spp <none@none> | 2010-04-19 17:13:20 +0200 |
---|---|---|
committer | Spp <none@none> | 2010-04-19 17:13:20 +0200 |
commit | 450c6af43bd18b42dc9475befa062d51f04a946c (patch) | |
tree | e8e16b6deee5e4c96a58d99825a051891cbffb68 | |
parent | 97b7aa111691d8545e1b6666c23251f20e61a8d9 (diff) |
Code Style: Remove trailing spaces and tab to spaces
--HG--
branch : trunk
-rw-r--r-- | src/game/CreatureEventAI.cpp | 2 | ||||
-rw-r--r-- | src/game/Group.cpp | 2 | ||||
-rw-r--r-- | src/game/Player.cpp | 20 | ||||
-rw-r--r-- | src/game/SpellAuraEffects.cpp | 2 | ||||
-rw-r--r-- | src/game/SpellMgr.cpp | 2 | ||||
-rw-r--r-- | src/game/World.cpp | 32 | ||||
-rw-r--r-- | src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp | 2 | ||||
-rw-r--r-- | src/scripts/northrend/borean_tundra.cpp | 4 | ||||
-rw-r--r-- | src/scripts/northrend/crystalsong_forest.cpp | 2 | ||||
-rw-r--r-- | src/scripts/northrend/vault_of_archavon/boss_toravon.cpp | 2 | ||||
-rw-r--r-- | src/scripts/world/go_scripts.cpp | 2 | ||||
-rw-r--r-- | src/scripts/world/item_scripts.cpp | 4 | ||||
-rw-r--r-- | src/scripts/world/npcs_special.cpp | 2 |
13 files changed, 39 insertions, 39 deletions
diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index a8aa99b74f0..bbb1dde36e7 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -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) diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 488649b2e78..0d9fc5eadf7 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -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); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 4405da3b7ef..e0acc99fcb0 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -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; } diff --git a/src/game/SpellAuraEffects.cpp b/src/game/SpellAuraEffects.cpp index cb417e50804..cf35274d38c 100644 --- a/src/game/SpellAuraEffects.cpp +++ b/src/game/SpellAuraEffects.cpp @@ -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: diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index e02702c210c..f50d7496ed0 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -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; diff --git a/src/game/World.cpp b/src/game/World.cpp index a8eaa306127..b231558d62a 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -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*/) { diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index 9cbc514b468..4863bdcb032 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -198,7 +198,7 @@ struct boss_krik_thirAI : public ScriptedAI pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_NARJIL)); if (!pAdd || !pAdd->isAlive()) return; - + pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE); } diff --git a/src/scripts/northrend/borean_tundra.cpp b/src/scripts/northrend/borean_tundra.cpp index 728e065e14a..e57e00f5554 100644 --- a/src/scripts/northrend/borean_tundra.cpp +++ b/src/scripts/northrend/borean_tundra.cpp @@ -648,7 +648,7 @@ enum eNesingwaryTrapper }; #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_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*/) { - + if (uiType != POINT_MOTION_TYPE) return; me->DisappearAndDie(); diff --git a/src/scripts/northrend/crystalsong_forest.cpp b/src/scripts/northrend/crystalsong_forest.cpp index 22e2ae1e091..208e9dea5b5 100644 --- a/src/scripts/northrend/crystalsong_forest.cpp +++ b/src/scripts/northrend/crystalsong_forest.cpp @@ -87,7 +87,7 @@ struct npc_warmage_violetstandAI : public Scripted_NoMovementAI uiTargetGUID = pOrb->GetGUID(); } - + if (Creature* pOrb = me->GetCreature(*me,uiTargetGUID)) DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); diff --git a/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp b/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp index 092339be6d5..2e16f9211d2 100644 --- a/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp +++ b/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp @@ -243,7 +243,7 @@ struct mob_frozen_orb_stalkerAI : public Scripted_NoMovementAI Unit* pToravon = me->GetCreature(*me, pInstance->GetData64(DATA_TORAVON)); if (!pToravon) return; - + uint8 num_orbs = RAID_MODE(1, 3); for (uint8 i=0; i<num_orbs; ++i) { diff --git a/src/scripts/world/go_scripts.cpp b/src/scripts/world/go_scripts.cpp index 28ba7b47e97..3f822266eb9 100644 --- a/src/scripts/world/go_scripts.cpp +++ b/src/scripts/world/go_scripts.cpp @@ -1097,7 +1097,7 @@ void AddSC_go_scripts() newscript->Name = "go_stillpine_cage"; newscript->pGOHello = &GOHello_go_stillpine_cage; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "go_amberpine_outhouse"; newscript->pGOHello = &GOHello_go_amberpine_outhouse; diff --git a/src/scripts/world/item_scripts.cpp b/src/scripts/world/item_scripts.cpp index 241f6020caa..49294213d91 100644 --- a/src/scripts/world/item_scripts.cpp +++ b/src/scripts/world/item_scripts.cpp @@ -255,7 +255,7 @@ enum ePileFakeFur }; #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_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); return true; } - } + } return false; } diff --git a/src/scripts/world/npcs_special.cpp b/src/scripts/world/npcs_special.cpp index c7c2d4a68ee..47bb0893d6a 100644 --- a/src/scripts/world/npcs_special.cpp +++ b/src/scripts/world/npcs_special.cpp @@ -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); 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->PlayerTalkClass->SendGossipMenu(TEXT_ISHUNTER, pCreature->GetGUID()); return true; } |