summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-06-02 09:47:20 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-06-02 09:47:20 +0000
commit00d3e974e0cd9da6806c80526f8d0f47ddf01dd2 (patch)
tree17f4c12314c78fae447584276ae6f7d7dcecf92c
parent7f5ecb3d24df397cdee57e545fae42a8e11024f8 (diff)
downloadmana-00d3e974e0cd9da6806c80526f8d0f47ddf01dd2.tar.gz
mana-00d3e974e0cd9da6806c80526f8d0f47ddf01dd2.tar.bz2
mana-00d3e974e0cd9da6806c80526f8d0f47ddf01dd2.tar.xz
mana-00d3e974e0cd9da6806c80526f8d0f47ddf01dd2.zip
Changed color of chat messages in OpenGL mode from orange to black.
-rw-r--r--ChangeLog2
-rw-r--r--src/gui/chat.cpp4
-rw-r--r--src/gui/chat.h4
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f035b0f3..b5ed34b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
* src/winver.h, README, NEWS, CMakeLists.txt, configure.ac,
data/help/changes.txt, data/help/header.txt: Updated version and
release date and summarized changes.
+ * src/gui/chat.h, src/gui/chat.cpp: Changed color of chat messages in
+ OpenGL mode from orange to black.
2007-06-01 Bjørn Lindeijer <bjorn@lindeijer.nl>
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index a6e5df83..aea92d4f 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -127,7 +127,7 @@ ChatWindow::chatLog(std::string line, int own)
break;
case BY_OTHER:
tmp.nick += CAT_NORMAL;
- lineColor = "##4"; // Equiv. to BrowserBox::ORANGE
+ lineColor = "##0"; // Equiv. to BrowserBox::BLACK
break;
case BY_SERVER:
tmp.nick += std::string("Server: ");
@@ -162,7 +162,7 @@ ChatWindow::chatLog(std::string line, int own)
// We look if the Vertical Scroll Bar is set at the max before
// adding a row, otherwise the max will always be a row higher
// at comparison.
- if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll() )
+ if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll())
{
mTextOutput->addRow(line);
mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 1269b98e..6be12b34 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -153,13 +153,13 @@ class ChatWindow : public Window, public gcn::ActionListener,
/*
* Determines whether to send a command or an ordinary message, then
- * contructs packets & sends them
+ * contructs packets & sends them.
*
* @param nick The character's name to display in front.
* @param msg The message text which is to be send.
*
* NOTE:
- * the nickname is required by the server, if not specified
+ * The nickname is required by the server, if not specified
* the message may not be sent unless a command was intended
* which requires another packet to be constructed! you can
* achieve this by putting a slash ("/") infront of the