Some fixes to player control, also attempting to solve long walk path problem.

2 files changed, 12 insertions, 2 deletions

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 49841623..380d9d13 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -213,13 +213,21 @@ void ChatWindow::action(const std::string& eventId)
         std::string message = chatInput->getText();
 
         if (message.length() > 0) {
+            // If message different from previous, put it in the history
             if (history.size() == 0 || message != history.back()) {
                 history.push_back(message);
             }
+
+            // Reset history iterator
             curHist = history.end();
+
+            // Send the message to the server
             chat_send(char_info[0].name, message.c_str());
+
+            // Clear the text from the chat input
             chatInput->setText("");
         }
+
         gui->focusNone();
     }
 }
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index d9ab90bd..5ef31a78 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -101,9 +101,11 @@ void Gui::draw()
 void Gui::mousePress(int mx, int my, int button)
 {
     // Mouse pressed on window container (basically, the map)
-    // Experimental mouse walk support
 
-    if (button == gcn::MouseInput::LEFT) {
+    // When conditions for walking are met, set new player destination
+    if (player_node->action != DEAD && current_npc == 0 &&
+            button == gcn::MouseInput::LEFT)
+    {
         int tilex = mx / 32 + camera_x;
         int tiley = my / 32 + camera_y;