summaryrefslogtreecommitdiff
path: root/src/log.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-02-18 19:17:57 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-02-18 19:17:57 +0000
commit8f28636093d75b33cc5071e659291ac2ff54db8b (patch)
tree3a14a0f1f3993f12bf54990c417d5858acdf6de0 /src/log.cpp
parent9a4006a58aa332855fa6e3c143de915cae2e952b (diff)
downloadMana-8f28636093d75b33cc5071e659291ac2ff54db8b.tar.gz
Mana-8f28636093d75b33cc5071e659291ac2ff54db8b.tar.bz2
Mana-8f28636093d75b33cc5071e659291ac2ff54db8b.tar.xz
Mana-8f28636093d75b33cc5071e659291ac2ff54db8b.zip
Merged revisions 3762-3772,3776-3782 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r3762 | crush_tmw | 2007-12-04 00:25:25 +0100 (Tue, 04 Dec 2007) | 1 line Added/renamed some headgears for the christmas event. ........ r3763 | crush_tmw | 2007-12-04 14:51:20 +0100 (Tue, 04 Dec 2007) | 1 line tophead -> tophat ........ r3764 | b_lindeijer | 2007-12-05 21:20:25 +0100 (Wed, 05 Dec 2007) | 3 lines Fix drawing of very high fringe tiles by keeping track of the maximum tile height. ........ r3765 | crush_tmw | 2007-12-07 01:50:15 +0100 (Fri, 07 Dec 2007) | 1 line Added a new drop item for the christmas event. ........ r3768 | crush_tmw | 2007-12-09 20:45:53 +0100 (Sun, 09 Dec 2007) | 1 line New versions of funky hat and elf hat by QOAL. ........ r3769 | crush_tmw | 2007-12-10 03:22:59 +0100 (Mon, 10 Dec 2007) | 1 line Simplified player subsprite handling by treating equipment, hairstyle and base sprites alike. Implementing female hairstyles is now a purely content-sided task. ........ r3770 | crush_tmw | 2007-12-10 03:50:15 +0100 (Mon, 10 Dec 2007) | 1 line Added an option to show log messages in the chat console. ........ r3771 | crush_tmw | 2007-12-10 17:12:56 +0100 (Mon, 10 Dec 2007) | 1 line Implemented female hairstyles. ........ r3772 | b_lindeijer | 2007-12-10 21:42:11 +0100 (Mon, 10 Dec 2007) | 2 lines Include cassert header. ........ r3777 | crush_tmw | 2007-12-14 18:33:45 +0100 (Fri, 14 Dec 2007) | 1 line Fixed some errors with the filenames of the new items (unrelated to my eAthena problems). ........ r3778 | crush_tmw | 2007-12-14 19:21:39 +0100 (Fri, 14 Dec 2007) | 1 line fixed some more screwups with the new items. ........ r3780 | crush_tmw | 2007-12-14 19:40:12 +0100 (Fri, 14 Dec 2007) | 1 line Put new items in equipment.xml for backward compatibility with the last client release. ........ r3782 | b_lindeijer | 2007-12-17 16:59:04 +0100 (Mon, 17 Dec 2007) | 2 lines Fixed the item tags. ........
Diffstat (limited to 'src/log.cpp')
-rw-r--r--src/log.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/log.cpp b/src/log.cpp
index 63a34776..96630a96 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -34,8 +34,11 @@
#include "log.h"
+#include "gui/chat.h"
+
Logger::Logger():
- mLogToStandardOut(false)
+ mLogToStandardOut(false),
+ mChatWindow(NULL)
{
}
@@ -100,6 +103,11 @@ void Logger::log(const char *log_text, ...)
std::cout << timeStr.str() << buf << std::endl;
}
+ if (mChatWindow)
+ {
+ mChatWindow->chatLog(buf, BY_LOGGER);
+ }
+
// Delete temporary buffer
delete[] buf;
}