diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-11-26 23:59:03 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-11-29 22:08:25 +0200 |
| commit | 23913f26cd0a075505b7e74df6b93584288afb92 (patch) | |
| tree | 928ed52b6fae1c4f6b2dacfa1abde9797a9a6fdd /src/server.cpp | |
| parent | 9714612999dc88e67566be91ec41659c5254321f (diff) | |
| download | minetest-23913f26cd0a075505b7e74df6b93584288afb92.tar.gz minetest-23913f26cd0a075505b7e74df6b93584288afb92.tar.bz2 minetest-23913f26cd0a075505b7e74df6b93584288afb92.zip | |
Support serialization of protocol 13 ContentFeatures
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server.cpp b/src/server.cpp index cb5447605..f29155ba0 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2255,8 +2255,9 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) return; } - getClient(peer_id)->serialization_version - = getClient(peer_id)->pending_serialization_version; + RemoteClient *client = getClient(peer_id); + client->serialization_version = + getClient(peer_id)->pending_serialization_version; /* Send some initialization data @@ -2269,7 +2270,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) SendItemDef(m_con, peer_id, m_itemdef); // Send node definitions - SendNodeDef(m_con, peer_id, m_nodedef); + SendNodeDef(m_con, peer_id, m_nodedef, client->net_proto_version); // Send media announcement sendMediaAnnouncement(peer_id); @@ -3521,7 +3522,7 @@ void Server::SendItemDef(con::Connection &con, u16 peer_id, } void Server::SendNodeDef(con::Connection &con, u16 peer_id, - INodeDefManager *nodedef) + INodeDefManager *nodedef, u16 protocol_version) { DSTACK(__FUNCTION_NAME); std::ostringstream os(std::ios_base::binary); @@ -3533,7 +3534,7 @@ void Server::SendNodeDef(con::Connection &con, u16 peer_id, */ writeU16(os, TOCLIENT_NODEDEF); std::ostringstream tmp_os(std::ios::binary); - nodedef->serialize(tmp_os); + nodedef->serialize(tmp_os, protocol_version); std::ostringstream tmp_os2(std::ios::binary); compressZlib(tmp_os.str(), tmp_os2); os<<serializeLongString(tmp_os2.str()); |