diff options
| author | Patric Stout <truebrain@openttd.org> | 2019-03-20 17:01:13 +0100 |
|---|---|---|
| committer | Patric Stout <truebrain@openttd.org> | 2019-03-20 19:24:55 +0100 |
| commit | e3c639a09f1d2251477f69496120d057dd8320a9 (patch) | |
| tree | 7d66891ae41db811e1edd13647b05092dca54b5a /src/fios.cpp | |
| parent | 72c5f2b3eed77120d86ecf636e07c71eb23b4bd5 (diff) | |
| download | openttd-e3c639a09f1d2251477f69496120d057dd8320a9.tar.xz | |
Remove: ENABLE_NETWORK switch
This switch has been a pain for years. Often disabling broke
compilation, as no developer compiles OpenTTD without, neither do
any of our official binaries.
Additionaly, it has grown so hugely in our codebase, that it
clearly shows that the current solution was a poor one. 350+
instances of "#ifdef ENABLE_NETWORK" were in the code, of which
only ~30 in the networking code itself. The rest were all around
the code to do the right thing, from GUI to NewGRF.
A more proper solution would be to stub all the functions, and
make sure the rest of the code can simply assume network is
available. This was also partially done, and most variables were
correct if networking was disabled. Despite that, often the #ifdefs
were still used.
With the recent removal of DOS, there is also no platform anymore
which we support where networking isn't working out-of-the-box.
All in all, it is time to remove the ENABLE_NETWORK switch. No
replacement is planned, but if you feel we really need this option,
we welcome any Pull Request which implements this in a way that
doesn't crawl through the code like this diff shows we used to.
Diffstat (limited to 'src/fios.cpp')
| -rw-r--r-- | src/fios.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/fios.cpp b/src/fios.cpp index aef3a8407..835c04ddb 100644 --- a/src/fios.cpp +++ b/src/fios.cpp @@ -13,11 +13,13 @@ */ #include "stdafx.h" -#include "fios.h" +#include "3rdparty/md5/md5.h" #include "fileio_func.h" -#include "tar_type.h" +#include "fios.h" +#include "network/network_content.h" #include "screenshot.h" #include "string_func.h" +#include "tar_type.h" #include <sys/stat.h> #ifndef _WIN32 @@ -632,10 +634,6 @@ const char *FiosGetScreenshotDir() return fios_screenshot_path; } -#if defined(ENABLE_NETWORK) -#include "network/network_content.h" -#include "3rdparty/md5/md5.h" - /** Basic data to distinguish a scenario. Used in the server list window */ struct ScenarioIdentifier { uint32 scenid; ///< ID for the scenario (generated by content). @@ -754,5 +752,3 @@ void ScanScenarios() { _scanner.Scan(true); } - -#endif /* ENABLE_NETWORK */ |