From 9e83411f7e4147d09af5a5006888dcc187ea0ef8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 7 Nov 2011 19:34:52 +0300 Subject: Fix some warnings under gcc 4.7. --- src/statuseffect.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/statuseffect.cpp') 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()); -- cgit v1.2.3-60-g2f50