summaryrefslogtreecommitdiff
path: root/src/spellmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
commit9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch)
treec084bdf8afabc6220779645dcb5dbf71af6a151f /src/spellmanager.cpp
parentbc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff)
downloadManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz
ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2
ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz
ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/spellmanager.cpp')
-rw-r--r--src/spellmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 9f7aaaa8b..d80090396 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -54,7 +54,7 @@ SpellManager::~SpellManager()
TextCommand* SpellManager::getSpell(int spellId)
{
if (spellId < 0 || static_cast<unsigned int>(spellId) >= mSpells.size())
- return NULL;
+ return nullptr;
return mSpells[spellId];
}
@@ -353,7 +353,7 @@ std::string SpellManager::autoComplete(std::string partName)
{
std::vector<TextCommand*>::const_iterator i = mSpellsVector.begin();
std::string newName = "";
- TextCommand *newCommand = NULL;
+ TextCommand *newCommand = nullptr;
while (i != mSpellsVector.end())
{
@@ -368,7 +368,7 @@ std::string SpellManager::autoComplete(std::string partName)
if (newName != "")
{
newName = findSameSubstring(line, newName);
- newCommand = NULL;
+ newCommand = nullptr;
}
else
{