From 5ceb4694a05ec68b5cfba18b0f25ba804be88a80 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Mon, 12 May 2008 18:32:15 +0000
Subject: console colors

---
 src/core/netserver.cc | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'src/core/netserver.cc')

diff --git a/src/core/netserver.cc b/src/core/netserver.cc
index e66f63d..5334c6f 100644
--- a/src/core/netserver.cc
+++ b/src/core/netserver.cc
@@ -39,7 +39,7 @@ namespace core
 
 NetServer::NetServer(std::string const host, unsigned int const port)
 {
-	con_print << "Initializing network server..." << std::endl;
+	con_print << "^BInitializing network server..." << std::endl;
 
 	// initialize variables
 	netserver_fd = -1;
@@ -84,7 +84,7 @@ NetServer::NetServer(std::string const host, unsigned int const port)
 		return;
 	}
 	
-	con_print << "  Listening on " << inet_ntoa(netserver_addr.sin_addr) <<	":" << ntohs(netserver_addr.sin_port) << std::endl;
+	con_print << "  listening on " << inet_ntoa(netserver_addr.sin_addr) <<	":" << ntohs(netserver_addr.sin_port) << std::endl;
 
 	// add the listening socket to the file descriptor set
 	FD_ZERO(&serverset);
@@ -98,7 +98,7 @@ NetServer::NetServer(std::string const host, unsigned int const port)
 
 NetServer::~NetServer()
 {
-	con_print << "Shutting down network server..." << std::endl;
+	con_print << "^BShutting down network server..." << std::endl;
 
 	std::string netmsg("disconnect\n");
 
@@ -140,8 +140,9 @@ void NetServer::reap()
 			(*it)->abort();
 
 			// print a message
-			std::string message(client->player()->name());
-			message.append(" timed out.");
+			std::string message("^B");
+			message.append(client->player()->name());
+			message.append(" ^Btimed out.");
 
 			if (client->state() == NetClient::Connected) {
 				server()->broadcast(message, client->player());
@@ -252,7 +253,6 @@ void NetServer::receive()
 	}
 	
 	// remove dead connections
-	// FIXME timeout
 	reap();
 }
 
@@ -365,8 +365,9 @@ void NetServer::parse_incoming_message(NetClient *client, const std::string & me
 
 		} else if ((client->state() == NetClient::Connected) && (client->player()->name() != oldname)) {
 
-			std::string netmsg(oldname);
-			netmsg.append(" renamed to ");
+			std::string netmsg("^B");
+			netmsg.append(oldname);
+			netmsg.append(" ^Brenamed to ");
 			netmsg.append(client->player()->name());
 			server()->broadcast(netmsg);
 		}
@@ -409,10 +410,7 @@ void NetServer::parse_incoming_message(NetClient *client, const std::string & me
 	// say
 	if (command == "say") {		
 		if (message.size() > command.size()+1) {
-			std::ostringstream osstream;
-			osstream << "msg public " << client->player()->name() << " " << message.substr(command.size()+1) << "\n";
-			broadcast(osstream.str());
-			con_print << client->player()->name() << " " << message.substr(command.size()+1) << std::endl;
+			server()->say(client->player(), message.substr(command.size()+1));
 		}
 		return;
 	}
-- 
cgit v1.2.3