diff options
| author | yexo <yexo@openttd.org> | 2011-12-09 21:49:52 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2011-12-09 21:49:52 +0000 |
| commit | dcba6c25ea0cad50dc779f8df359bdd45b6def26 (patch) | |
| tree | 7d8a220d37c957eaa0f62838e25e06b78772bf27 /src/network | |
| parent | d9b9ac6013eccff386da96a3ef8b97912b994584 (diff) | |
| download | openttd-dcba6c25ea0cad50dc779f8df359bdd45b6def26.tar.xz | |
(svn r23465) -Feature [FS#4827]: add 'find missing content online' button to 'load savegame' and 'find network game' windows
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/network_content.h | 2 | ||||
| -rw-r--r-- | src/network/network_gui.cpp | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/network/network_content.h b/src/network/network_content.h index f9a7fdca1..ce369cdae 100644 --- a/src/network/network_content.h +++ b/src/network/network_content.h @@ -151,6 +151,8 @@ extern ClientNetworkContentSocketHandler _network_content_client; void ShowNetworkContentListWindow(ContentVector *cv = NULL, ContentType type = CONTENT_TYPE_END); +void ShowMissingContentWindow(const struct GRFConfig *list); + #else static inline void ShowNetworkContentListWindow() {} #endif /* ENABLE_NETWORK */ diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 03901e295..42b89813c 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -19,6 +19,7 @@ #include "network_gamelist.h" #include "network.h" #include "network_base.h" +#include "network_content.h" #include "../gui.h" #include "network_udp.h" #include "../window_func.h" @@ -105,6 +106,8 @@ enum NetworkGameWindowWidgets { NGWW_REFRESH, ///< 'Refresh server' button NGWW_NEWGRF, ///< 'NewGRF Settings' button NGWW_NEWGRF_SEL, ///< Selection 'widget' to hide the NewGRF settings + NGWW_NEWGRF_MISSING, ///< 'Find missing NewGRF online' button + NGWW_NEWGRF_MISSING_SEL, ///< Selection widget for the above button NGWW_FIND, ///< 'Find server' button NGWW_ADD, ///< 'Add server' button @@ -603,6 +606,7 @@ public: /* 'NewGRF Settings' button invisible if no NewGRF is used */ this->GetWidget<NWidgetStacked>(NGWW_NEWGRF_SEL)->SetDisplayedPlane(sel == NULL || !sel->online || sel->info.grfconfig == NULL); + this->GetWidget<NWidgetStacked>(NGWW_NEWGRF_MISSING_SEL)->SetDisplayedPlane(sel == NULL || !sel->online || sel->info.grfconfig == NULL || !sel->info.version_compatible || sel->info.compatible); this->DrawWidgets(); /* Edit box to set client name */ @@ -776,6 +780,10 @@ public: case NGWW_NEWGRF: // NewGRF Settings if (this->server != NULL) ShowNewGRFSettings(false, false, false, &this->server->info.grfconfig); break; + + case NGWW_NEWGRF_MISSING: // Find missing content online + if (this->server != NULL) ShowMissingContentWindow(this->server->info.grfconfig); + break; } } @@ -960,6 +968,12 @@ static const NWidgetPart _nested_network_game_widgets[] = { NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, NGWW_DETAILS), NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(5, 5, 5), NWidget(WWT_EMPTY, INVALID_COLOUR, NGWW_DETAILS_SPACER), SetMinimalSize(140, 155), SetResize(0, 1), SetFill(1, 1), // Make sure it's at least this wide + NWidget(NWID_HORIZONTAL, NC_NONE), SetPIP(5, 5, 5), + NWidget(NWID_SELECTION, INVALID_COLOUR, NGWW_NEWGRF_MISSING_SEL), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_NEWGRF_MISSING), SetFill(1, 0), SetDataTip(STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON, STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP), + NWidget(NWID_SPACER), SetFill(1, 0), + EndContainer(), + EndContainer(), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(5, 5, 5), NWidget(NWID_SPACER), SetFill(1, 0), NWidget(NWID_SELECTION, INVALID_COLOUR, NGWW_NEWGRF_SEL), |