From 8aa04fc836116a58f8ffd1e0c3539b9ea8a94ddf Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Thu, 21 Feb 2008 19:06:15 +0000
Subject: dedicated server, entity transfer

---
 src/core/netserver.cc | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

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

diff --git a/src/core/netserver.cc b/src/core/netserver.cc
index 3473e6a..43067d7 100644
--- a/src/core/netserver.cc
+++ b/src/core/netserver.cc
@@ -58,6 +58,29 @@ void NetServer::client_connect(int const clientfd, std::string const host, int c
 	
 	con_print << client->host() << ":" << client->port() << " connected.\n";
 
+	std::ostringstream netmsg;
+
+	// send entities
+	std::map<unsigned int, Entity *>::iterator it;
+	for (it=Entity::registry.begin(); it != Entity::registry.end(); it++) {		
+		netmsg.str("");
+		switch ((*it).second->type()) {
+			case Entity::Default:
+			case Entity::Dynamic:
+			case Entity::Controlable:
+				netmsg << "ent ";
+				(*it).second->serialize(netmsg);
+				netmsg << "\n";
+				client->send(netmsg.str());
+				break;
+			default:
+				break;
+		}
+	}
+
+	// mark player as dirty
+	client->player()->player_dirty = true;
+
 	// notify the game server
 	server()->player_connect(client->player());
 
@@ -169,6 +192,9 @@ NetClient *NetServer::find_client(Player const *player)
  */
 void NetServer::parse_incoming_message(NetClient *client, const std::string & message) 
 {
+	if (!message.size())
+		return;
+
 	std::stringstream msgstream(message);
 	
 	std::string command;
@@ -189,6 +215,24 @@ void NetServer::parse_incoming_message(NetClient *client, const std::string & me
 		return;
 	}
 
+	// cup - client update entity
+	if (command == "cup") {
+		//con_debug << message << "\n";
+		unsigned int id;
+		if (msgstream >> id) {
+			Entity *entity = Entity::find(id);
+			if (!entity) {
+				con_warn << client->host() << ":" << client->port() << " update for unknown entity " << id << "\n";
+				
+			} else {
+				entity->entity_dirty = true;
+				entity->recieve_client_update(msgstream);
+			}
+			
+		}
+		return;
+	}
+
 	// say
 	if (command == "say") {		
 		if (message.size() > command.size()+1) {
@@ -200,7 +244,7 @@ void NetServer::parse_incoming_message(NetClient *client, const std::string & me
 		return;
 	}
 	
-	// name is an alias for set name
+	// name
 	if (command == "name") {
 		std::string name;
 		if (msgstream >> name) {
-- 
cgit v1.2.3