summaryrefslogtreecommitdiff
path: root/src/gui/chat.cpp
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2008-12-06 19:50:57 -0700
committerFate <fate-tmw@googlemail.com>2008-12-06 19:50:57 -0700
commit483941ef2a4faef54865b3ce2e316cb32ed8cf64 (patch)
treea542f040a80497eca957c36adbfb490ed419b02b /src/gui/chat.cpp
parent617fb41e21710856c1451058481e5df3756fb355 (diff)
parent416e28057f5a6073a2ef44f296ed1c8bc1280bf6 (diff)
downloadmana-client-483941ef2a4faef54865b3ce2e316cb32ed8cf64.tar.gz
mana-client-483941ef2a4faef54865b3ce2e316cb32ed8cf64.tar.bz2
mana-client-483941ef2a4faef54865b3ce2e316cb32ed8cf64.tar.xz
mana-client-483941ef2a4faef54865b3ce2e316cb32ed8cf64.zip
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/gui/chat.cpp')
-rw-r--r--src/gui/chat.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index a96c2eda..b9e11dad 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -327,7 +327,10 @@ ChatWindow::chatSend(const std::string &nick, std::string msg)
}
else if (msg.substr(0, IS_WHERE_LENGTH) == IS_WHERE)
{
- chatLog(map_path, BY_SERVER);
+ // Display the current map, X, and Y
+ std::ostringstream where;
+ where << map_path << " " << player_node->mX << "," << player_node->mY;
+ chatLog(where.str(), BY_SERVER);
}
else if (msg.substr(0, IS_WHO_LENGTH) == IS_WHO)
{
@@ -339,9 +342,9 @@ ChatWindow::chatSend(const std::string &nick, std::string msg)
mTextOutput->clearRows();
}
else if (msg.substr(0, IS_WHISPER_LENGTH) == IS_WHISPER)
- whisper(nick, msg, IS_WHISPER_LENGTH + 1);
+ whisper(nick, msg, IS_WHISPER_LENGTH);
else if (msg.substr(0, IS_SHORT_WHISPER_LENGTH) == IS_SHORT_WHISPER)
- whisper(nick, msg, IS_SHORT_WHISPER_LENGTH + 1);
+ whisper(nick, msg, IS_SHORT_WHISPER_LENGTH);
else
{
chatLog("Unknown command", BY_SERVER);