diff options
Diffstat (limited to 'src/core/netserver.cc')
| -rw-r--r-- | src/core/netserver.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/netserver.cc b/src/core/netserver.cc index 95b047a..cdcdad7 100644 --- a/src/core/netserver.cc +++ b/src/core/netserver.cc @@ -300,7 +300,7 @@ void NetServer::client_initialize(NetClient *client) { } // send updates to one client -void NetServer::client_frame(NetClient *client, float timestamp, float previoustimestamp) +void NetServer::client_frame(NetClient *client, unsigned long timestamp) { if (client->state() != NetClient::Connected) return; @@ -328,7 +328,7 @@ void NetServer::client_frame(NetClient *client, float timestamp, float previoust } else { // send a server frame marker - send_frame_marker(client, timestamp, previoustimestamp); + send_frame_marker(client, timestamp); // send updates for entities in the zone for (Entity::Registry::iterator it = Entity::registry().begin(); it != Entity::registry().end(); it++) { @@ -361,7 +361,7 @@ void NetServer::client_frame(NetClient *client, float timestamp, float previoust } // run a network server frame, send updates to clients -void NetServer::frame(float timestamp, float previoustimestamp) +void NetServer::frame(unsigned long timestamp) { /* FIXME Only entities within visual range should send updates (1024 game units?) @@ -376,7 +376,7 @@ void NetServer::frame(float timestamp, float previoustimestamp) client->transmit(fd()); if (client->state() == NetClient::Connected) - client_frame(client, timestamp, previoustimestamp); + client_frame(client, timestamp); // update player info always gets through if (client->player()->dirty() || client->player()->zonechange()) { @@ -449,10 +449,10 @@ void NetServer::send_disconnect(NetClient *client) } // send a "frame" message to a client -void NetServer::send_frame_marker(NetClient *client, float timestamp, float previoustimestamp) +void NetServer::send_frame_marker(NetClient *client, unsigned long timestamp) { std::ostringstream msg(""); - msg << "frame " << timestamp << " " << previoustimestamp << "\n"; + msg << "frame " << timestamp << "\n"; if (client->state() == NetClient::Connected) { client->send_raw(msg.str()); |