Fixed clicking near player.

4 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ff19640..d1da6749 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-15  David Athay  <ko2fan@gmail.com>
+
+	* src/gui/viewport.cpp, src/beingmanager.cpp, tmw.cbp: Fixed clicking
+	near player.
+
 2008-04-14  Dennis Friis  <peavey@placid.dk>
 
 	* src/gui/chat.cpp: Tweaked /whisper command to allow quoting of nicks
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))
                     {
diff --git a/tmw.cbp b/tmw.cbp
index e3ee08ea..9dae56cc 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -334,7 +334,7 @@
 		<Unit filename="src/tileset.h" />
 		<Unit filename="src/tmw.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="unix" />
+			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
 		<Unit filename="src/utils/base64.cpp" />
 		<Unit filename="src/utils/base64.h" />