mirror of
https://github.com/minetest/minetest.git
synced 2024-11-27 01:53:45 +01:00
Weather backward compatibility
This commit is contained in:
parent
0e89bca173
commit
06cdce1e12
@ -556,14 +556,14 @@ void Client::step(float dtime)
|
|||||||
|
|
||||||
// Send TOSERVER_INIT
|
// Send TOSERVER_INIT
|
||||||
// [0] u16 TOSERVER_INIT
|
// [0] u16 TOSERVER_INIT
|
||||||
// [2] u8 SER_FMT_VER_HIGHEST
|
// [2] u8 SER_FMT_VER_HIGHEST_READ
|
||||||
// [3] u8[20] player_name
|
// [3] u8[20] player_name
|
||||||
// [23] u8[28] password (new in some version)
|
// [23] u8[28] password (new in some version)
|
||||||
// [51] u16 minimum supported network protocol version (added sometime)
|
// [51] u16 minimum supported network protocol version (added sometime)
|
||||||
// [53] u16 maximum supported network protocol version (added later than the previous one)
|
// [53] u16 maximum supported network protocol version (added later than the previous one)
|
||||||
SharedBuffer<u8> data(2+1+PLAYERNAME_SIZE+PASSWORD_SIZE+2+2);
|
SharedBuffer<u8> data(2+1+PLAYERNAME_SIZE+PASSWORD_SIZE+2+2);
|
||||||
writeU16(&data[0], TOSERVER_INIT);
|
writeU16(&data[0], TOSERVER_INIT);
|
||||||
writeU8(&data[2], SER_FMT_VER_HIGHEST);
|
writeU8(&data[2], SER_FMT_VER_HIGHEST_READ);
|
||||||
|
|
||||||
memset((char*)&data[3], 0, PLAYERNAME_SIZE);
|
memset((char*)&data[3], 0, PLAYERNAME_SIZE);
|
||||||
snprintf((char*)&data[3], PLAYERNAME_SIZE, "%s", myplayer->getName());
|
snprintf((char*)&data[3], PLAYERNAME_SIZE, "%s", myplayer->getName());
|
||||||
@ -1154,8 +1154,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
|
|||||||
infostream<<"Client: TOCLIENT_INIT received with "
|
infostream<<"Client: TOCLIENT_INIT received with "
|
||||||
"deployed="<<((int)deployed&0xff)<<std::endl;
|
"deployed="<<((int)deployed&0xff)<<std::endl;
|
||||||
|
|
||||||
if(deployed < SER_FMT_VER_LOWEST
|
if(!ser_ver_supported(deployed))
|
||||||
|| deployed > SER_FMT_VER_HIGHEST)
|
|
||||||
{
|
{
|
||||||
infostream<<"Client: TOCLIENT_INIT: Server sent "
|
infostream<<"Client: TOCLIENT_INIT: Server sent "
|
||||||
<<"unsupported ser_fmt_ver"<<std::endl;
|
<<"unsupported ser_fmt_ver"<<std::endl;
|
||||||
@ -1300,6 +1299,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
|
|||||||
*/
|
*/
|
||||||
//infostream<<"Updating"<<std::endl;
|
//infostream<<"Updating"<<std::endl;
|
||||||
block->deSerialize(istr, ser_version, false);
|
block->deSerialize(istr, ser_version, false);
|
||||||
|
block->deSerializeNetworkSpecific(istr);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -1309,6 +1309,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
|
|||||||
//infostream<<"Creating new"<<std::endl;
|
//infostream<<"Creating new"<<std::endl;
|
||||||
block = new MapBlock(&m_env.getMap(), p, this);
|
block = new MapBlock(&m_env.getMap(), p, this);
|
||||||
block->deSerialize(istr, ser_version, false);
|
block->deSerialize(istr, ser_version, false);
|
||||||
|
block->deSerializeNetworkSpecific(istr);
|
||||||
sector->insertBlock(block);
|
sector->insertBlock(block);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -101,6 +101,7 @@ SharedBuffer<u8> makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed);
|
|||||||
range added to ItemDefinition
|
range added to ItemDefinition
|
||||||
drowning, leveled and liquid_range added to ContentFeatures
|
drowning, leveled and liquid_range added to ContentFeatures
|
||||||
stepheight and collideWithObjects added to object properties
|
stepheight and collideWithObjects added to object properties
|
||||||
|
version, heat and humidity transfer in MapBock
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define LATEST_PROTOCOL_VERSION 21
|
#define LATEST_PROTOCOL_VERSION 21
|
||||||
@ -509,7 +510,7 @@ enum ToServerCommand
|
|||||||
Sent first after connected.
|
Sent first after connected.
|
||||||
|
|
||||||
[0] u16 TOSERVER_INIT
|
[0] u16 TOSERVER_INIT
|
||||||
[2] u8 SER_FMT_VER_HIGHEST
|
[2] u8 SER_FMT_VER_HIGHEST_READ
|
||||||
[3] u8[20] player_name
|
[3] u8[20] player_name
|
||||||
[23] u8[28] password (new in some version)
|
[23] u8[28] password (new in some version)
|
||||||
[51] u16 minimum supported network protocol version (added sometime)
|
[51] u16 minimum supported network protocol version (added sometime)
|
||||||
|
@ -893,7 +893,7 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
// Print startup message
|
// Print startup message
|
||||||
infostream<<PROJECT_NAME<<
|
infostream<<PROJECT_NAME<<
|
||||||
" "<<_("with")<<" SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST
|
" "<<_("with")<<" SER_FMT_VER_HIGHEST_READ="<<(int)SER_FMT_VER_HIGHEST_READ
|
||||||
<<", "<<BUILD_INFO
|
<<", "<<BUILD_INFO
|
||||||
<<std::endl;
|
<<std::endl;
|
||||||
|
|
||||||
|
@ -3568,7 +3568,7 @@ void ServerMap::saveSectorMeta(ServerMapSector *sector)
|
|||||||
{
|
{
|
||||||
DSTACK(__FUNCTION_NAME);
|
DSTACK(__FUNCTION_NAME);
|
||||||
// Format used for writing
|
// Format used for writing
|
||||||
u8 version = SER_FMT_VER_HIGHEST;
|
u8 version = SER_FMT_VER_HIGHEST_WRITE;
|
||||||
// Get destination
|
// Get destination
|
||||||
v2s16 pos = sector->getPos();
|
v2s16 pos = sector->getPos();
|
||||||
std::string dir = getSectorDir(pos);
|
std::string dir = getSectorDir(pos);
|
||||||
@ -3767,7 +3767,7 @@ void ServerMap::saveBlock(MapBlock *block)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Format used for writing
|
// Format used for writing
|
||||||
u8 version = SER_FMT_VER_HIGHEST;
|
u8 version = SER_FMT_VER_HIGHEST_WRITE;
|
||||||
// Get destination
|
// Get destination
|
||||||
v3s16 p3d = block->getPos();
|
v3s16 p3d = block->getPos();
|
||||||
|
|
||||||
@ -3875,7 +3875,7 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto
|
|||||||
Save blocks loaded in old format in new format
|
Save blocks loaded in old format in new format
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(version < SER_FMT_VER_HIGHEST || save_after_load)
|
if(version < SER_FMT_VER_HIGHEST_WRITE || save_after_load)
|
||||||
{
|
{
|
||||||
saveBlock(block);
|
saveBlock(block);
|
||||||
|
|
||||||
@ -3942,7 +3942,7 @@ void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool
|
|||||||
Save blocks loaded in old format in new format
|
Save blocks loaded in old format in new format
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//if(version < SER_FMT_VER_HIGHEST || save_after_load)
|
//if(version < SER_FMT_VER_HIGHEST_READ || save_after_load)
|
||||||
// Only save if asked to; no need to update version
|
// Only save if asked to; no need to update version
|
||||||
if(save_after_load)
|
if(save_after_load)
|
||||||
saveBlock(block);
|
saveBlock(block);
|
||||||
|
@ -636,11 +636,21 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk)
|
|||||||
// Node timers
|
// Node timers
|
||||||
m_node_timers.serialize(os, version);
|
m_node_timers.serialize(os, version);
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
if(version >= 26){
|
}
|
||||||
writeF1000(os, heat);
|
|
||||||
writeF1000(os, humidity);
|
void MapBlock::serializeNetworkSpecific(std::ostream &os, u16 net_proto_version)
|
||||||
}
|
{
|
||||||
|
if(data == NULL)
|
||||||
|
{
|
||||||
|
throw SerializationError("ERROR: Not writing dummy block.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(net_proto_version >= 21){
|
||||||
|
int version = 1;
|
||||||
|
writeU8(os, version);
|
||||||
|
writeF1000(os, heat);
|
||||||
|
writeF1000(os, humidity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -743,17 +753,30 @@ void MapBlock::deSerialize(std::istream &is, u8 version, bool disk)
|
|||||||
<<": Node timers (ver>=25)"<<std::endl);
|
<<": Node timers (ver>=25)"<<std::endl);
|
||||||
m_node_timers.deSerialize(is, version);
|
m_node_timers.deSerialize(is, version);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
if(version >= 26){
|
|
||||||
heat = readF1000(is);
|
|
||||||
humidity = readF1000(is);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TRACESTREAM(<<"MapBlock::deSerialize "<<PP(getPos())
|
TRACESTREAM(<<"MapBlock::deSerialize "<<PP(getPos())
|
||||||
<<": Done."<<std::endl);
|
<<": Done."<<std::endl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MapBlock::deSerializeNetworkSpecific(std::istream &is)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
int version = readU8(is);
|
||||||
|
//if(version != 1)
|
||||||
|
// throw SerializationError("unsupported MapBlock version");
|
||||||
|
if(version >= 1) {
|
||||||
|
heat = readF1000(is);
|
||||||
|
humidity = readF1000(is);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch(SerializationError &e)
|
||||||
|
{
|
||||||
|
errorstream<<"WARNING: MapBlock::deSerializeNetworkSpecific(): Ignoring an error"
|
||||||
|
<<": "<<e.what()<<std::endl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Legacy serialization
|
Legacy serialization
|
||||||
*/
|
*/
|
||||||
|
@ -479,6 +479,9 @@ public:
|
|||||||
// unknown blocks from id-name mapping to wndef
|
// unknown blocks from id-name mapping to wndef
|
||||||
void deSerialize(std::istream &is, u8 version, bool disk);
|
void deSerialize(std::istream &is, u8 version, bool disk);
|
||||||
|
|
||||||
|
void serializeNetworkSpecific(std::ostream &os, u16 net_proto_version);
|
||||||
|
void deSerializeNetworkSpecific(std::istream &is);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/*
|
/*
|
||||||
Private methods
|
Private methods
|
||||||
|
@ -691,7 +691,7 @@ bool DecoSchematic::loadSchematicFile() {
|
|||||||
|
|
||||||
delete schematic;
|
delete schematic;
|
||||||
schematic = new MapNode[nodecount];
|
schematic = new MapNode[nodecount];
|
||||||
MapNode::deSerializeBulk(is, SER_FMT_VER_HIGHEST, schematic,
|
MapNode::deSerializeBulk(is, SER_FMT_VER_HIGHEST_READ, schematic,
|
||||||
nodecount, 2, 2, true);
|
nodecount, 2, 2, true);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -738,7 +738,7 @@ void DecoSchematic::saveSchematicFile(INodeDefManager *ndef) {
|
|||||||
os << serializeString(ndef->get(usednodes[i]).name); // node names
|
os << serializeString(ndef->get(usednodes[i]).name); // node names
|
||||||
|
|
||||||
// compressed bulk node data
|
// compressed bulk node data
|
||||||
MapNode::serializeBulk(os, SER_FMT_VER_HIGHEST, schematic,
|
MapNode::serializeBulk(os, SER_FMT_VER_HIGHEST_WRITE, schematic,
|
||||||
nodecount, 2, 2, true);
|
nodecount, 2, 2, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,16 +61,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
23: new node metadata format
|
23: new node metadata format
|
||||||
24: 16-bit node ids and node timers (never released as stable)
|
24: 16-bit node ids and node timers (never released as stable)
|
||||||
25: Improved node timer format
|
25: Improved node timer format
|
||||||
26: MapBlocks contain heat and humidity
|
26: Never written; read the same as 25
|
||||||
*/
|
*/
|
||||||
// This represents an uninitialized or invalid format
|
// This represents an uninitialized or invalid format
|
||||||
#define SER_FMT_VER_INVALID 255
|
#define SER_FMT_VER_INVALID 255
|
||||||
// Highest supported serialization version
|
// Highest supported serialization version
|
||||||
#define SER_FMT_VER_HIGHEST 26
|
#define SER_FMT_VER_HIGHEST_READ 26
|
||||||
|
// Saved on disk version
|
||||||
|
#define SER_FMT_VER_HIGHEST_WRITE 25
|
||||||
// Lowest supported serialization version
|
// Lowest supported serialization version
|
||||||
#define SER_FMT_VER_LOWEST 0
|
#define SER_FMT_VER_LOWEST 0
|
||||||
|
|
||||||
#define ser_ver_supported(v) (v >= SER_FMT_VER_LOWEST && v <= SER_FMT_VER_HIGHEST)
|
#define ser_ver_supported(v) (v >= SER_FMT_VER_LOWEST && v <= SER_FMT_VER_HIGHEST_READ)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Misc. serialization functions
|
Misc. serialization functions
|
||||||
|
@ -1783,7 +1783,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
|
|||||||
if(command == TOSERVER_INIT)
|
if(command == TOSERVER_INIT)
|
||||||
{
|
{
|
||||||
// [0] u16 TOSERVER_INIT
|
// [0] u16 TOSERVER_INIT
|
||||||
// [2] u8 SER_FMT_VER_HIGHEST
|
// [2] u8 SER_FMT_VER_HIGHEST_READ
|
||||||
// [3] u8[20] player_name
|
// [3] u8[20] player_name
|
||||||
// [23] u8[28] password <--- can be sent without this, from old versions
|
// [23] u8[28] password <--- can be sent without this, from old versions
|
||||||
|
|
||||||
@ -1796,7 +1796,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
|
|||||||
// First byte after command is maximum supported
|
// First byte after command is maximum supported
|
||||||
// serialization version
|
// serialization version
|
||||||
u8 client_max = data[2];
|
u8 client_max = data[2];
|
||||||
u8 our_max = SER_FMT_VER_HIGHEST;
|
u8 our_max = SER_FMT_VER_HIGHEST_READ;
|
||||||
// Use the highest version supported by both
|
// Use the highest version supported by both
|
||||||
u8 deployed = std::min(client_max, our_max);
|
u8 deployed = std::min(client_max, our_max);
|
||||||
// If it's lower than the lowest supported, give up.
|
// If it's lower than the lowest supported, give up.
|
||||||
@ -4079,7 +4079,7 @@ void Server::setBlockNotSent(v3s16 p)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server::SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver)
|
void Server::SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver, u16 net_proto_version)
|
||||||
{
|
{
|
||||||
DSTACK(__FUNCTION_NAME);
|
DSTACK(__FUNCTION_NAME);
|
||||||
|
|
||||||
@ -4112,6 +4112,7 @@ void Server::SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver)
|
|||||||
|
|
||||||
std::ostringstream os(std::ios_base::binary);
|
std::ostringstream os(std::ios_base::binary);
|
||||||
block->serialize(os, ver, false);
|
block->serialize(os, ver, false);
|
||||||
|
block->serializeNetworkSpecific(os, net_proto_version);
|
||||||
std::string s = os.str();
|
std::string s = os.str();
|
||||||
SharedBuffer<u8> blockdata((u8*)s.c_str(), s.size());
|
SharedBuffer<u8> blockdata((u8*)s.c_str(), s.size());
|
||||||
|
|
||||||
@ -4195,7 +4196,7 @@ void Server::SendBlocks(float dtime)
|
|||||||
|
|
||||||
RemoteClient *client = getClient(q.peer_id);
|
RemoteClient *client = getClient(q.peer_id);
|
||||||
|
|
||||||
SendBlockNoLock(q.peer_id, block, client->serialization_version);
|
SendBlockNoLock(q.peer_id, block, client->serialization_version, client->net_proto_version);
|
||||||
|
|
||||||
client->SentBlock(q.pos);
|
client->SentBlock(q.pos);
|
||||||
|
|
||||||
|
@ -603,7 +603,7 @@ private:
|
|||||||
void setBlockNotSent(v3s16 p);
|
void setBlockNotSent(v3s16 p);
|
||||||
|
|
||||||
// Environment and Connection must be locked when called
|
// Environment and Connection must be locked when called
|
||||||
void SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver);
|
void SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver, u16 net_proto_version);
|
||||||
|
|
||||||
// Sends blocks to clients (locks env and con on its own)
|
// Sends blocks to clients (locks env and con on its own)
|
||||||
void SendBlocks(float dtime);
|
void SendBlocks(float dtime);
|
||||||
|
@ -612,7 +612,7 @@ struct TestCompress: public TestBase
|
|||||||
fromdata[3]=1;
|
fromdata[3]=1;
|
||||||
|
|
||||||
std::ostringstream os(std::ios_base::binary);
|
std::ostringstream os(std::ios_base::binary);
|
||||||
compress(fromdata, os, SER_FMT_VER_HIGHEST);
|
compress(fromdata, os, SER_FMT_VER_HIGHEST_READ);
|
||||||
|
|
||||||
std::string str_out = os.str();
|
std::string str_out = os.str();
|
||||||
|
|
||||||
@ -627,7 +627,7 @@ struct TestCompress: public TestBase
|
|||||||
std::istringstream is(str_out, std::ios_base::binary);
|
std::istringstream is(str_out, std::ios_base::binary);
|
||||||
std::ostringstream os2(std::ios_base::binary);
|
std::ostringstream os2(std::ios_base::binary);
|
||||||
|
|
||||||
decompress(is, os2, SER_FMT_VER_HIGHEST);
|
decompress(is, os2, SER_FMT_VER_HIGHEST_READ);
|
||||||
std::string str_out2 = os2.str();
|
std::string str_out2 = os2.str();
|
||||||
|
|
||||||
infostream<<"decompress: ";
|
infostream<<"decompress: ";
|
||||||
|
Loading…
Reference in New Issue
Block a user