From 1d580ed36893b24b618ff1e6f9023e497c62498c Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 19 Oct 2008 16:03:56 +0000
Subject: on-screen notifications

---
 src/client/client.cc | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'src/client/client.cc')

diff --git a/src/client/client.cc b/src/client/client.cc
index 45cc47a..c1fab8a 100644
--- a/src/client/client.cc
+++ b/src/client/client.cc
@@ -92,6 +92,9 @@ void Client::quit(int status)
 void Client::init(int count, char **arguments)
 {
 	con_print << "^BInitializing client..." << std::endl;
+
+	client_console = 0;
+	client_view = 0;
 	
 	// initialize core
 	core::Cvar::sv_private = core::Cvar::set("sv_private", "0");
@@ -262,12 +265,23 @@ void Client::notify_zonechange()
 	render::unload();
 }
 
-void Client::notify_sound(const char * name)
+void Client::notify_sound(const char *name)
 {
 	audio::play(name);
 }
 
-void Client::notify_message(core::Message::Channel const channel, std::string const message)
+void Client::notify_message(const char *message)
+{
+	std::string text(message);
+	notify_message(core::Message::Info, text);
+}
+
+void Client::notify_message(const std::string &message)
+{
+	notify_message(core::Message::Info, message);
+}
+
+void Client::notify_message(const core::Message::Channel channel, const std::string &message)
 {
 
 	switch(channel) {
@@ -293,9 +307,12 @@ void Client::notify_message(core::Message::Channel const channel, std::string co
 			break;
 	}
 
+	if (view()) {
+		view()->chat()->event_text(message);
+		view()->notify()->event_text(message);
+	}
+
 	con_print << message << std::endl;
-	view()->chat()->event_text(message);
-	//console()->notify(message);
 }
 
 /* FIXME
-- 
cgit v1.2.3