diff options
| author | rubidium42 <rubidium@openttd.org> | 2021-07-18 11:05:46 +0200 |
|---|---|---|
| committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-07-18 11:42:25 +0200 |
| commit | 09a7825d1e03de58a5496a3eb11aa7bf6823ae18 (patch) | |
| tree | e1d563276dc96ea9582e19d1f7c9f528c52b8c6b /src/network | |
| parent | 3479e59eea1c1a0241497bac28b68dfd8809672b (diff) | |
| download | openttd-09a7825d1e03de58a5496a3eb11aa7bf6823ae18.tar.xz | |
Remove: the concept of UnknownGRFs
These were filled with "<Unknown>" (before 8a2da49) and later their name would get filled via UDP requests to the server. These UDP packets do not exist anymore, so they will always remain "<Unknown>".
Remove that logic and just use the generic translated error GRF UNKNOWN string instead.
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/core/game_info.cpp | 5 | ||||
| -rw-r--r-- | src/network/network_gamelist.cpp | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/network/core/game_info.cpp b/src/network/core/game_info.cpp index 32b8fdb75..d3c0491ba 100644 --- a/src/network/core/game_info.cpp +++ b/src/network/core/game_info.cpp @@ -166,10 +166,7 @@ static void HandleIncomingNetworkGameInfoGRFConfig(GRFConfig *config) /* Find the matching GRF file */ const GRFConfig *f = FindGRFConfig(config->ident.grfid, FGCM_EXACT, config->ident.md5sum); if (f == nullptr) { - /* Don't know the GRF, so mark game incompatible and the (possibly) - * already resolved name for this GRF (another server has sent the - * name of the GRF already */ - config->name = FindUnknownGRFName(config->ident.grfid, config->ident.md5sum, true); + AddGRFTextToList(config->name, GetString(STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN)); config->status = GCS_NOT_FOUND; } else { config->filename = f->filename; diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp index d4843ff67..ef5405dd2 100644 --- a/src/network/network_gamelist.cpp +++ b/src/network/network_gamelist.cpp @@ -125,10 +125,7 @@ void NetworkAfterNewGRFScan() const GRFConfig *f = FindGRFConfig(c->ident.grfid, FGCM_EXACT, c->ident.md5sum); if (f == nullptr) { - /* Don't know the GRF, so mark game incompatible and the (possibly) - * already resolved name for this GRF (another server has sent the - * name of the GRF already. */ - c->name = FindUnknownGRFName(c->ident.grfid, c->ident.md5sum, true); + /* Don't know the GRF (anymore), so mark game incompatible. */ c->status = GCS_NOT_FOUND; /* If we miss a file, we're obviously incompatible. */ |