From b57d845e55f733514d235e24f64b09a8744f3abc Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Mon, 26 Apr 2021 20:02:58 +0200 Subject: Codechange: refactor CheckGameCompatibility() from existing function Later commits use this function in other places too. --- src/network/core/game_info.cpp | 15 +++++++++++++++ src/network/core/game_info.h | 1 + 2 files changed, 16 insertions(+) (limited to 'src/network/core') diff --git a/src/network/core/game_info.cpp b/src/network/core/game_info.cpp index b664bb580..55b5d1749 100644 --- a/src/network/core/game_info.cpp +++ b/src/network/core/game_info.cpp @@ -106,6 +106,21 @@ bool IsNetworkCompatibleVersion(const char *other) return hash1 != nullptr && hash2 != nullptr && strncmp(hash1, hash2, GITHASH_SUFFIX_LEN) == 0; } +/** + * Check if an game entry is compatible with our client. + */ +void CheckGameCompatibility(NetworkGameInfo &ngi) +{ + /* Check if we are allowed on this server based on the revision-check. */ + ngi.version_compatible = IsNetworkCompatibleVersion(ngi.server_revision); + ngi.compatible = ngi.version_compatible; + + /* Check if we have all the GRFs on the client-system too. */ + for (const GRFConfig *c = ngi.grfconfig; c != nullptr; c = c->next) { + if (c->status == GCS_NOT_FOUND) ngi.compatible = false; + } +} + /** * Fill a NetworkGameInfo structure with the latest information of the server. * @param ngi the NetworkGameInfo struct to fill with data. diff --git a/src/network/core/game_info.h b/src/network/core/game_info.h index 776700511..28aea7507 100644 --- a/src/network/core/game_info.h +++ b/src/network/core/game_info.h @@ -93,6 +93,7 @@ extern NetworkServerGameInfo _network_game_info; const char *GetNetworkRevisionString(); bool IsNetworkCompatibleVersion(const char *other); +void CheckGameCompatibility(NetworkGameInfo &ngi); void FillNetworkGameInfo(NetworkGameInfo &ngi); -- cgit v1.2.3-54-g00ecf