diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
| commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
| tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/statuseffect.cpp | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | manaverse-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/statuseffect.cpp')
| -rw-r--r-- | src/statuseffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index dccf21f46..f7bffc31f 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -65,7 +65,7 @@ void StatusEffect::deliverMessage() Particle *StatusEffect::getParticle() { if (!particleEngine || mParticleEffect.empty()) - return NULL; + return nullptr; else return particleEngine->addEffect(mParticleEffect, 0, 0); } @@ -74,7 +74,7 @@ AnimatedSprite *StatusEffect::getIcon() { if (mIcon.empty()) { - return NULL; + return nullptr; } else { @@ -141,7 +141,7 @@ void StatusEffect::load() for_each_xml_child_node(node, rootNode) { - status_effect_map *the_map = NULL; + status_effect_map *the_map = nullptr; int index = atoi(XML::getProperty(node, "id", "-1").c_str()); |