Files
@ r23483:3733e6b8ff17
Branch filter:
Location: cpp/openttd-patchpack/source/src/station_gui.h - annotation
r23483:3733e6b8ff17
1.4 KiB
text/x-c
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.
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.
r8016:8a1d54caaa5f r8016:8a1d54caaa5f r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r8016:8a1d54caaa5f r8016:8a1d54caaa5f r8016:8a1d54caaa5f r8016:8a1d54caaa5f r8016:8a1d54caaa5f r10626:59619471b98d r14248:a9050881acd7 r14248:a9050881acd7 r10626:59619471b98d r8016:8a1d54caaa5f r13982:8be996466531 r8107:82461791b7a2 r18668:b656d614c4fd r18668:b656d614c4fd r18668:b656d614c4fd r8107:82461791b7a2 r8107:82461791b7a2 r12355:15ed6906d629 r8107:82461791b7a2 r8107:82461791b7a2 r21006:a7581b215a57 r21006:a7581b215a57 r10626:59619471b98d r8016:8a1d54caaa5f | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file station_gui.h Contains enums and function declarations connected with stations GUI */
#ifndef STATION_GUI_H
#define STATION_GUI_H
#include "command_type.h"
#include "tilearea_type.h"
#include "window_type.h"
/** Types of cargo to display for station coverage. */
enum StationCoverageType {
SCT_PASSENGERS_ONLY, ///< Draw only passenger class cargoes.
SCT_NON_PASSENGERS_ONLY, ///< Draw all non-passenger class cargoes.
SCT_ALL, ///< Draw all cargoes.
};
int DrawStationCoverageAreaText(int left, int right, int top, StationCoverageType sct, int rad, bool supplies);
void CheckRedrawStationCoverage(const Window *w);
void ShowSelectStationIfNeeded(const CommandContainer &cmd, TileArea ta);
void ShowSelectWaypointIfNeeded(const CommandContainer &cmd, TileArea ta);
#endif /* STATION_GUI_H */
|