diff options
author | Stijn Buys <ingar@osirion.org> | 2008-05-05 17:45:30 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-05-05 17:45:30 +0000 |
commit | c11c0174ece92b4502648ad33653975bfdfc39a0 (patch) | |
tree | 88860bfcbb7206834e61533af79f7631b5638cb2 /src/core/netserver.cc | |
parent | 7218e3bd4616d4706090ec47d72845a2bb89c6a3 (diff) |
lights with entity color, sunlight, network stats
Diffstat (limited to 'src/core/netserver.cc')
-rw-r--r-- | src/core/netserver.cc | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/core/netserver.cc b/src/core/netserver.cc index ca08def..3005922 100644 --- a/src/core/netserver.cc +++ b/src/core/netserver.cc @@ -28,6 +28,7 @@ #include "core/cvar.h" #include "core/func.h" #include "core/core.h" +#include "core/stats.h" #ifdef _WIN32 typedef int socklen_t; @@ -203,7 +204,8 @@ void NetServer::receive() } else { //con_debug << "Incoming data '" << recbuf << "'"<< bytes_received << " bytes" << std::endl; } - + Stats::network_bytes_received += bytes_received; + // originator std::string client_host (inet_ntoa(client_addr.sin_addr)); unsigned int client_port = ntohs(client_addr.sin_port); @@ -284,20 +286,10 @@ void NetServer::client_initialize(NetClient *client) { 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; - } + netmsg << "ent "; + (*it).second->serialize(netmsg); + netmsg << "\n"; + client->send(netmsg.str()); } netmsg.str("connect\n"); client->send(netmsg.str()); |