summaryrefslogtreecommitdiff
path: root/src/gui/chat.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-02-12 10:59:11 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-02-12 10:59:11 +0000
commit915c9b4e7daf2f49c25e254b66ef6e53a9207b29 (patch)
treea5986e1c31ad77366b26a82c4568d9ef1d65ef19 /src/gui/chat.h
parent078a31f906b618c1526b98ba63043a2267a858c6 (diff)
downloadmana-915c9b4e7daf2f49c25e254b66ef6e53a9207b29.tar.gz
mana-915c9b4e7daf2f49c25e254b66ef6e53a9207b29.tar.bz2
mana-915c9b4e7daf2f49c25e254b66ef6e53a9207b29.tar.xz
mana-915c9b4e7daf2f49c25e254b66ef6e53a9207b29.zip
Merged revisions 3687-3688,3690 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r3687 | crush_tmw | 2007-10-26 02:22:12 +0200 (Fri, 26 Oct 2007) | 1 line Added possibility of length limitation to browserbox and used it for the chatlog (length set by the config option "ChatLogLength"). ........ r3688 | crush_tmw | 2007-10-26 02:38:00 +0200 (Fri, 26 Oct 2007) | 1 line Removed some completely useless code from the chat class. ........ r3690 | crush_tmw | 2007-10-26 14:50:49 +0200 (Fri, 26 Oct 2007) | 1 line Implemented monster hurt sounds and added new sound effects by Cosmostrator. ........
Diffstat (limited to 'src/gui/chat.h')
-rw-r--r--src/gui/chat.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/chat.h b/src/gui/chat.h
index ee699cf2..304d5500 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -183,7 +183,7 @@ class ChatWindow : public Window, public gcn::ActionListener,
/** Called to add the channel to the channel manager */
void
addChannel(short channel, std::string channelName);
-
+
/** Called to remove the channel from the channel manager */
void
removeChannel(short channel);
@@ -225,8 +225,6 @@ class ChatWindow : public Window, public gcn::ActionListener,
int own;
};
- std::list<CHATLOG> mChatlog;
-
#if 0
/** Constructs failed messages for actions */
std::string const_msg(CHATSKILL);
@@ -250,4 +248,3 @@ class ChatWindow : public Window, public gcn::ActionListener,
extern ChatWindow *chatWindow;
#endif
-