diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index cc34606792..c310c5897a 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -31,7 +31,7 @@ // This string specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "11" +#define NETWORK_STREAM_VERSION "12" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr; diff --git a/src/openrct2/network/NetworkTypes.h b/src/openrct2/network/NetworkTypes.h index c6fb88ce81..2308662055 100644 --- a/src/openrct2/network/NetworkTypes.h +++ b/src/openrct2/network/NetworkTypes.h @@ -55,7 +55,6 @@ enum NETWORK_COMMAND NETWORK_COMMAND_GAMECMD, NETWORK_COMMAND_TICK, NETWORK_COMMAND_PLAYERLIST, - NETWORK_COMMAND_PLAYERINFO, NETWORK_COMMAND_PING, NETWORK_COMMAND_PINGLIST, NETWORK_COMMAND_SETDISCONNECTMSG, @@ -66,10 +65,13 @@ enum NETWORK_COMMAND NETWORK_COMMAND_TOKEN, NETWORK_COMMAND_OBJECTS, NETWORK_COMMAND_GAME_ACTION, + NETWORK_COMMAND_PLAYERINFO, NETWORK_COMMAND_MAX, NETWORK_COMMAND_INVALID = -1 }; +static_assert(NETWORK_COMMAND::NETWORK_COMMAND_GAMEINFO == 9, "Master server expects this to be 9"); + // Structure is used for networking specific fields with meaning, // this structure can be used in combination with DataSerialiser // to provide extra details with template specialization.