diff options
| author | truelight <truelight@openttd.org> | 2004-12-13 14:57:58 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2004-12-13 14:57:58 +0000 |
| commit | 1c4c5ae37037146a4079263ccb0ef20969a33fec (patch) | |
| tree | bacfc04a36174eecd4d484dafac8c080a2a6d767 | |
| parent | c0247e66e892bc14bb2452f87402a432564b4204 (diff) | |
| download | openttd-1c4c5ae37037146a4079263ccb0ef20969a33fec.tar.xz | |
(svn r1052) -Fix: [Network] You can't join a server when revision mismatches.
| -rw-r--r-- | lang/english.txt | 1 | ||||
| -rw-r--r-- | network_gui.c | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/lang/english.txt b/lang/english.txt index badee2c4e..a54b8dc0a 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -1227,6 +1227,7 @@ STR_NETWORK_CURRENT_DATE :{SILVER}Current date: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Password protected! STR_NETWORK_SERVER_OFFLINE :{SILVER}SERVER OFFLINE STR_NETWORK_SERVER_FULL :{SILVER}SERVER FULL +STR_NETWORK_VERSION_MISMATCH :{SILVER}VERSION MISMATCH STR_NETWORK_JOIN_GAME :{BLACK}Join game diff --git a/network_gui.c b/network_gui.c index d30bd9517..c6cf153a6 100644 --- a/network_gui.c +++ b/network_gui.c @@ -87,6 +87,12 @@ static void NetworkGameWindowWndProc(Window *w, WindowEvent *e) w->disabled_state = (1<<17); // Server offline, join button disabled else if (_selected_item->info.clients_on == _selected_item->info.clients_max) w->disabled_state = (1<<17); // Server full, join button disabled +#ifdef WITH_REV + else if (strncmp(_selected_item->info.server_revision, _openttd_revision, 10) != 0) { + if (strncmp(_selected_item->info.server_revision, "norev000", sizeof(_selected_item->info.server_revision)) != 0) + w->disabled_state = (1<<17); // Revision mismatch, join button disabled + } +#endif else w->disabled_state = 0; @@ -201,6 +207,14 @@ static void NetworkGameWindowWndProc(Window *w, WindowEvent *e) DrawString(260, y, STR_NETWORK_CURRENT_DATE, 2); // current date y+=10; + y+=2; + +#ifdef WITH_REV + if (strncmp(_selected_item->info.server_revision, _openttd_revision, 10) != 0) { + if (strncmp(_selected_item->info.server_revision, "norev000", sizeof(_selected_item->info.server_revision)) != 0) + DrawStringMultiCenter(360, y, STR_NETWORK_VERSION_MISMATCH, 2); // server mismatch + } else +#endif if (_selected_item->info.clients_on == _selected_item->info.clients_max) // Show: server full, when clients_on == clients_max DrawStringMultiCenter(360, y, STR_NETWORK_SERVER_FULL, 2); // server full |