summaryrefslogtreecommitdiff
path: root/src/beingmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/beingmanager.cpp')
-rw-r--r--src/beingmanager.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index abb23f5e..22b3de9b 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -89,6 +89,8 @@ Being* BeingManager::createBeing(int id, int type, int subtype)
void BeingManager::destroyBeing(Being *being)
{
mBeings.remove(being);
+ if(being == player_node->getTarget())
+ player_node->setTarget(NULL);
delete being;
}
@@ -179,7 +181,7 @@ Being* BeingManager::findNearestLivingBeing(Uint16 x, Uint16 y, int maxdist,
}
}
- return (maxdist >= dist) ? closestBeing : NULL;
+ return (maxdist >= dist) ? NULL : closestBeing;
}
Being* BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
@@ -207,5 +209,5 @@ Being* BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
}
}
- return (maxdist >= dist) ? closestBeing : NULL;
+ return (maxdist >= dist) ? NULL : closestBeing;
}