1 files changed, 16 insertions, 0 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index fbd24377..48b49248 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -138,6 +138,16 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
         }
     }
 
+    // *implements actions in a backwards compatible way*
+    if (own == BY_PLAYER &&
+	tmp.text.at(0) == '*' &&
+	tmp.text.at(tmp.text.length()-1) == '*')
+    {
+	tmp.text[0] = ' ';
+	tmp.text.erase(tmp.text.length() - 1);
+	own = ACT_IS;
+    }
+
     std::string lineColor = "##C";
     switch (own)
     {
@@ -595,6 +605,12 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
             chatLog(_("Present: ") + response, BY_SERVER);
         }
     }
+    else if (command == "me")
+    {
+	std::stringstream actionStr;
+	actionStr << "*" << msg << "*";
+	chatSend(player_node->getName(), actionStr.str());
+    }
     else
     {
         chatLog(_("Unknown command"), BY_SERVER);