Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-06-29 18:22:07 +0000
committerStijn Buys <ingar@osirion.org>2009-06-29 18:22:07 +0000
commit024532b748b15a92303fd20c3b6a7062a37ca2ed (patch)
treea313dee0aed03c27582a68432e40b96ab90dfbed /src/core/netserver.cc
parentbf96f47d2c993112327f278eb2dd270b769e59aa (diff)
client player list updates, short pif network messages, bump to network proto version 17
Diffstat (limited to 'src/core/netserver.cc')
-rw-r--r--src/core/netserver.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/netserver.cc b/src/core/netserver.cc
index 2639b97..7416d9f 100644
--- a/src/core/netserver.cc
+++ b/src/core/netserver.cc
@@ -398,13 +398,14 @@ void NetServer::frame(unsigned long timestamp)
client->transmit();
+ // send game state changes
if (client->state() == NetClient::Connected)
client_frame(client, timestamp);
- // update player info always gets through
if (client->player()->dirty() || client->player()->zonechange()) {
send_player_update(client);
}
+
client->transmit();
}
@@ -537,12 +538,12 @@ void NetServer::send_player_update(NetClient *client)
client->send_raw(msg.str());
}
-// send a "pif" update player information to a single player
+// send a short "pif" update player information to a single player
void NetServer::send_player_update(NetClient *client, Player *player)
{
std::ostringstream msg;
msg << "pif " << player->id() << ' ';
- player->serialize_server_update(msg);
+ player->serialize_short_server_update(msg);
msg << '\n';
client->send_raw(msg.str());
}