josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More warning fixes

Browse Source
This commit is contained in:
Shauren
2011-03-08 19:11:02 +01:00
parent cbbfb52ca7
commit 9710c41a40
19 changed files with 119 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellMgr.h
+4 -5
View File
@@ -537,7 +537,7 @@ inline uint32 GetDispellMask(DispelType dispel)
if (dispel == DISPEL_ALL)
return DISPEL_ALL_MASK;
else
return (1 << dispel);
return uint32(1 << dispel);
}
// Diminishing Returns interaction with spells
@@ -1087,16 +1087,15 @@ class SpellMgr
}
if (SpellDiff->SpellID[mode] <= 0 && mode > DUNGEON_DIFFICULTY_HEROIC)
{
uint8 baseMode = mode;
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "GetSpellForDifficultyFromSpell: spell %u mode %u spell is NULL, using mode %u", spell->Id, mode, mode-2);
mode -= 2;
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "GetSpellForDifficultyFromSpell: spell %u mode %u spell is NULL, using mode %u", spell->Id, baseMode, mode);
}
if (SpellDiff->SpellID[mode] <= 0)
{
sLog->outErrorDb("GetSpellForDifficultyFromSpell: spell %u mode %u spell is 0. Check spelldifficulty_dbc!", spell->Id, mode);
return spell;
}
SpellEntry const* newSpell = sSpellStore.LookupEntry(SpellDiff->SpellID[mode]);
SpellEntry const* newSpell = sSpellStore.LookupEntry(uint32(SpellDiff->SpellID[mode]));
if (!newSpell)
{
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "GetSpellForDifficultyFromSpell: spell %u not found in SpellStore. Check spelldifficulty_dbc!", SpellDiff->SpellID[mode]);
@@ -1198,7 +1197,7 @@ class SpellMgr
return spell_id;
}
uint32 IsArenaAllowedEnchancment(uint32 ench_id) const
bool IsArenaAllowedEnchancment(uint32 ench_id) const
{
return mEnchantCustomAttr[ench_id];
}