Fixed problem with mouse walking through GUI.

4 files changed, 23 insertions, 11 deletions

diff --git a/src/game.cpp b/src/game.cpp
index 00ad352d..9d55b3e4 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -351,14 +351,6 @@ void do_input()
                     }
                 }
             }
-            else if (event.button.button == 1)
-            {
-                // Experimental mouse walk support
-                walk(mx, my, 0);
-                player_node->setPath(tiledMap->findPath(
-                            player_node->x, player_node->y,
-                            mx, my));
-            }
         }
 
         // Push input to GUI when not used
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index cf4c5b36..5c77f317 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -24,6 +24,9 @@
 #include "gui.h"
 #include "window.h"
 #include "windowcontainer.h"
+#include "../engine.h"
+#include "../net/protocol.h"
+#include "../main.h"
 
 // Guichan stuff
 Gui *gui;
@@ -53,6 +56,7 @@ Gui::Gui(Graphics *graphics):
     guiTop = new WindowContainer();
     guiTop->setDimension(gcn::Rectangle(0, 0, screen->w, screen->h));
     guiTop->setOpaque(false);
+    guiTop->addMouseListener(this);
     Window::setWindowContainer(guiTop);
 
     // Create focus handler
@@ -165,3 +169,16 @@ void Gui::focusNone()
 {
     focusHandler->focusNone();
 }
+
+void Gui::mousePress(int mx, int my, int button)
+{
+    // Mouse pressed on window container (basically, the map)
+    int tilex = mx / 32 + camera_x;
+    int tiley = my / 32 + camera_y;
+
+    // Experimental mouse walk support
+    walk(mx, my, 0);
+    player_node->setPath(tiledMap->findPath(
+                player_node->x, player_node->y,
+                tilex, tiley));
+}
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 1c50a2f6..3bcffc5d 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -38,7 +38,7 @@
  *
  * \ingroup GUI
  */
-class Gui
+class Gui : public gcn::MouseListener
 {
     public:
         /**
@@ -72,6 +72,11 @@ class Gui
          */
         void draw();
 
+        /**
+         * Handles mouse press on map.
+         */
+        void mousePress(int mx, int my, int button);
+
     private:
         gcn::Gui *gui;                        /**< The GUI system */
 #ifdef USE_OPENGL
diff --git a/src/main.h b/src/main.h
index e8cf4511..57a4860f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -37,8 +37,6 @@
 #include <stdio.h>
 #include <memory>
 
-#define CORE_VERSION "0.0.9"
-
 #ifdef ERROR
 #undef ERROR
 #endif