Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: [Network] Remove variable from NetworkGameInfo that is only used during deserialisation

Browse Source
This commit is contained in:
Rubidium 2021-05-05 20:38:18 +02:00 committed by rubidium42
parent e7581fd42d
commit ead30dc725
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,7 +252,7 @@ void DeserializeNetworkGameInfo(Packet *p, NetworkGameInfo *info)
{ {
static const Date MAX_DATE = ConvertYMDToDate(MAX_YEAR, 11, 31); // December is month 11 static const Date MAX_DATE = ConvertYMDToDate(MAX_YEAR, 11, 31); // December is month 11
info->game_info_version = p->Recv_uint8(); byte game_info_version = p->Recv_uint8();
/* /*
* Please observe the order. * Please observe the order.
@ -262,7 +262,7 @@ void DeserializeNetworkGameInfo(Packet *p, NetworkGameInfo *info)
/* Update the documentation in game_info.h on changes /* Update the documentation in game_info.h on changes
* to the NetworkGameInfo wire-protocol! */ * to the NetworkGameInfo wire-protocol! */
switch (info->game_info_version) { switch (game_info_version) {
case 4: { case 4: {
GRFConfig **dst = &info->grfconfig; GRFConfig **dst = &info->grfconfig;
uint i; uint i;
@ -302,7 +302,7 @@ void DeserializeNetworkGameInfo(Packet *p, NetworkGameInfo *info)
info->clients_max = p->Recv_uint8 (); info->clients_max = p->Recv_uint8 ();
info->clients_on = p->Recv_uint8 (); info->clients_on = p->Recv_uint8 ();
info->spectators_on = p->Recv_uint8 (); info->spectators_on = p->Recv_uint8 ();
if (info->game_info_version < 3) { // 16 bits dates got scrapped and are read earlier if (game_info_version < 3) { // 16 bits dates got scrapped and are read earlier
info->game_date = p->Recv_uint16() + DAYS_TILL_ORIGINAL_BASE_YEAR; info->game_date = p->Recv_uint16() + DAYS_TILL_ORIGINAL_BASE_YEAR;
info->start_date = p->Recv_uint16() + DAYS_TILL_ORIGINAL_BASE_YEAR; info->start_date = p->Recv_uint16() + DAYS_TILL_ORIGINAL_BASE_YEAR;
} }

1
src/network/core/game_info.h
View File

@ -85,7 +85,6 @@ struct NetworkServerGameInfo {
struct NetworkGameInfo : NetworkServerGameInfo { struct NetworkGameInfo : NetworkServerGameInfo {
bool version_compatible; ///< Can we connect to this server or not? (based on server_revision) bool version_compatible; ///< Can we connect to this server or not? (based on server_revision)
bool compatible; ///< Can we connect to this server or not? (based on server_revision _and_ grf_match bool compatible; ///< Can we connect to this server or not? (based on server_revision _and_ grf_match
byte game_info_version; ///< Version of the game info
}; };
extern NetworkServerGameInfo _network_game_info; extern NetworkServerGameInfo _network_game_info;