summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/beingmanager.cpp1
-rw-r--r--src/gui/viewport.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 4e3ab0fa..0619bfc2 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -133,6 +133,7 @@ Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y)
{
Being *being = (*itr);
if ((being->mAction != Being::DEAD) &&
+ (being != player_node) &&
(being->getPixelX() <= x) &&
(being->getPixelX() + being->getWidth() >= x) &&
(being->getPixelY() <= y) &&
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index d53204b6..f2e32973 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -413,8 +413,6 @@ Viewport::mousePressed(gcn::MouseEvent &event)
case Being::PLAYER:
if (being->mAction == Being::DEAD)
break;
- if (being == player_node)
- break;
if (player_node->withinAttackRange(being))
{