summaryrefslogtreecommitdiff
path: root/src/spellmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-03-18 17:48:29 +0200
committerAndrei Karas <akaras@inbox.ru>2011-03-18 17:49:00 +0200
commitf98d003e354a1792117b7cbc771d1dd91475a156 (patch)
treedc2a297f7c4026394c9954ae4bfd4abd22ef9612 /src/spellmanager.cpp
parentbb0a6cb25b2985fd1f74c9d27d5a46f6863e2dee (diff)
downloadManaVerse-f98d003e354a1792117b7cbc771d1dd91475a156.tar.gz
ManaVerse-f98d003e354a1792117b7cbc771d1dd91475a156.tar.bz2
ManaVerse-f98d003e354a1792117b7cbc771d1dd91475a156.tar.xz
ManaVerse-f98d003e354a1792117b7cbc771d1dd91475a156.zip
Fix most old style cast except manaserv and libxml2 defines.
Diffstat (limited to 'src/spellmanager.cpp')
-rw-r--r--src/spellmanager.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index fb0a338d5..ef630fc67 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -52,7 +52,7 @@ SpellManager::~SpellManager()
TextCommand* SpellManager::getSpell(int spellId)
{
- if (spellId < 0 || (unsigned int)spellId >= mSpells.size())
+ if (spellId < 0 || static_cast<unsigned int>(spellId) >= mSpells.size())
return NULL;
return mSpells[spellId];
@@ -273,15 +273,16 @@ void SpellManager::load(bool oldConfig)
std::string icon = cfg->getValue("commandShortcutIcon"
+ toString(i), "");
- if ((TextCommandType)commandType == TEXT_COMMAND_MAGIC)
+ if (static_cast<TextCommandType>(commandType) == TEXT_COMMAND_MAGIC)
{
- addSpell(new TextCommand(i, symbol, cmd, (SpellTarget)targetType,
- icon, basicLvl, (MagicSchool)school, schoolLvl, mana));
+ addSpell(new TextCommand(i, symbol, cmd,
+ static_cast<SpellTarget>(targetType), icon, basicLvl,
+ static_cast<MagicSchool>(school), schoolLvl, mana));
}
else
{
- addSpell(new TextCommand(i, symbol, cmd, (SpellTarget)targetType,
- icon));
+ addSpell(new TextCommand(i, symbol, cmd,
+ static_cast<SpellTarget>(targetType), icon));
}
}
}