diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 39ea9838c..3b6078dba 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -3084,7 +3084,6 @@ void ObjectMgr::LoadArenaTeams() do { - Field *fields = result->Fetch(); bar.step(); ++count; diff --git a/src/game/Player.cpp b/src/game/Player.cpp index ddb2c3a82..c0a435d2a 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -13796,7 +13796,7 @@ bool Player::CanShareQuest(uint32 quest_id) const void Player::SetQuestStatus(uint32 quest_id, QuestStatus status) { - if (Quest const* qInfo = sObjectMgr.GetQuestTemplate(quest_id)) + if (sObjectMgr.GetQuestTemplate(quest_id)) { QuestStatusData& q_status = mQuestStatus[quest_id]; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 611561250..006f6eb58 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1181,7 +1181,6 @@ void Unit::CalculateSpellDamage(SpellNonMeleeDamage *damageInfo, int32 damage, S if(!this->isAlive() || !pVictim->isAlive()) return; - uint32 crTypeMask = pVictim->GetCreatureTypeMask(); // Check spell crit chance bool crit = isSpellCrit(pVictim, spellInfo, damageSchoolMask, attackType); bool blocked = false; @@ -9258,7 +9257,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM if (spellProto->SpellFamilyFlags & UI64LIT(0x0000100000000000)) { // Flame Shock - if (Aura *flameShock = pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, UI64LIT(0x0000000010000000), 0, GetGUID())) + if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, UI64LIT(0x0000000010000000), 0, GetGUID())) return true; } break; diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp index 10ad94862..98720eae2 100644 --- a/src/mangosd/Master.cpp +++ b/src/mangosd/Master.cpp @@ -52,9 +52,6 @@ extern int m_ServiceStatus; #endif -/// \todo Warning disabling not useful under VC++2005. Can somebody say on which compiler it is useful? -#pragma warning(disable:4305) - INSTANTIATE_SINGLETON_1( Master ); volatile uint32 Master::m_masterLoopCounter = 0; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5f1e9e425..38ef83fa8 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9351" + #define REVISION_NR "9352" #endif // __REVISION_NR_H__