From c41bcce1e8cf3956861612ad54981d1d5098fb51 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Sun, 20 Jun 2021 02:32:37 +0300 Subject: [PATCH] Emscripten: removed network stubs and re-enabled multiplayer dialog --- CMakeLists.txt | 2 +- src/network/network_gui.cpp | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7092756bdb..45343c99f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,7 +330,7 @@ if(EMSCRIPTEN) add_definitions(-s DISABLE_EXCEPTION_CATCHING=0) # Export functions to Javascript. - target_link_libraries(WASM::WASM INTERFACE "-s EXPORTED_FUNCTIONS='[\"_main\", \"_em_openttd_add_server\"]' -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") + target_link_libraries(WASM::WASM INTERFACE "-s EXPORTED_FUNCTIONS='[\"_main\"]' -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") # Preload all the files we generate during build. # As we do not compile with FreeType / FontConfig, we also have no way to diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 338182a836..0680c3554f 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -598,13 +598,6 @@ public: this->GetWidget(WID_NG_NEWGRF_SEL)->SetDisplayedPlane(sel == nullptr || !sel->online || sel->info.grfconfig == nullptr); this->GetWidget(WID_NG_NEWGRF_MISSING_SEL)->SetDisplayedPlane(sel == nullptr || !sel->online || sel->info.grfconfig == nullptr || !sel->info.version_compatible || sel->info.compatible); -#ifdef __EMSCRIPTEN__ - this->SetWidgetDisabledState(WID_NG_SEARCH_INTERNET, true); - this->SetWidgetDisabledState(WID_NG_SEARCH_LAN, true); - this->SetWidgetDisabledState(WID_NG_ADD, true); - this->SetWidgetDisabledState(WID_NG_START, true); -#endif - this->DrawWidgets(); }