dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Encode oversize map dimensions in non-extended game info serialisation

Browse Source 
Use non power of 2 values for sizes >= 64k
This commit is contained in:
Jonathan G Rennison
2021-11-02 23:28:03 +00:00
parent eaf5908a0b
commit 6611ed5a53
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/network/core/game_info.cpp
View File

@@ -250,8 +250,16 @@ void SerializeNetworkGameInfo(Packet *p, const NetworkServerGameInfo *info, bool
p->Send_uint8 (info->clients_max); p->Send_uint8 (info->clients_max);
p->Send_uint8 (info->clients_on); p->Send_uint8 (info->clients_on);
p->Send_uint8 (info->spectators_on); p->Send_uint8 (info->spectators_on);
p->Send_uint16(info->map_width);
p->Send_uint16(info->map_height); auto encode_map_size = [&](uint32 in) -> uint16 {
if (in < UINT16_MAX) {
return in;
} else {
return 65000 + FindFirstBit(in);
}
};
p->Send_uint16(encode_map_size(info->map_width));
p->Send_uint16(encode_map_size(info->map_height));
p->Send_uint8 (info->landscape); p->Send_uint8 (info->landscape);
p->Send_bool (info->dedicated); p->Send_bool (info->dedicated);
} }
@@ -415,8 +423,17 @@ void DeserializeNetworkGameInfo(Packet *p, NetworkGameInfo *info, const GameInfo
info->start_date = p->Recv_uint16() + DAYS_TILL_ORIGINAL_BASE_YEAR; info->start_date = p->Recv_uint16() + DAYS_TILL_ORIGINAL_BASE_YEAR;
} }
if (game_info_version < 6) while (p->Recv_uint8() != 0) {} // Used to contain the map-name. if (game_info_version < 6) while (p->Recv_uint8() != 0) {} // Used to contain the map-name.
info->map_width = p->Recv_uint16();
info->map_height = p->Recv_uint16(); auto decode_map_size = [&](uint16 in) -> uint32 {
if (in >= 65000) {
return 1 << (in - 65000);
} else {
return in;
}
};
info->map_width = decode_map_size(p->Recv_uint16());
info->map_height = decode_map_size(p->Recv_uint16());
info->landscape = p->Recv_uint8 (); info->landscape = p->Recv_uint8 ();
info->dedicated = p->Recv_bool (); info->dedicated = p->Recv_bool ();