Files
@ r23483:3733e6b8ff17
Branch filter:
Location: cpp/openttd-patchpack/source/src/misc.cpp - annotation
r23483:3733e6b8ff17
3.1 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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | r5584:545d748cc681 r5584:545d748cc681 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r6201:2e76eb9a1d7a r5584:545d748cc681 r6453:b0b56773284a r8763:c2c776621d56 r10696:8dfe83e30d01 r14825:a1801b3f007f r17884:c09c40617963 r6332:7393965b5322 r8119:8fdb3a371896 r8140:9424f012f6a2 r8144:1432edd15267 r8224:194097dc7288 r9457:ecfeb802c57a r9005:e59c0b10c56a r9127:933c13888121 r9898:bbef3303e005 r10911:571c959dc9ed r17360:71e102cec3ce r18746:ffe36c655ceb r20341:d334ae194449 r23436:cfad304b5b27 r23435:0f8f3f8f40ec r23437:6ce81d75a8ed r8224:194097dc7288 r21383:942c32fb8b0e r21383:942c32fb8b0e r5584:545d748cc681 r8973:bd926d7578a7 r10696:8dfe83e30d01 r5584:545d748cc681 r12674:8254ab83ecad r14055:e4168a875df8 r6247:96e840dbefcc r6247:96e840dbefcc r6247:96e840dbefcc r6247:96e840dbefcc r6247:96e840dbefcc r23287:0e81c2168d96 r15972:6463015373ad r6247:96e840dbefcc r15797:444e01a3fa29 r6247:96e840dbefcc r10207:a1fc2f2a33db r8965:16f6e5e9ed36 r6247:96e840dbefcc r8987:5af9a103757a r5584:545d748cc681 r12635:3d67c34135d4 r5584:545d748cc681 r10911:571c959dc9ed r10911:571c959dc9ed r10911:571c959dc9ed r10911:571c959dc9ed r5584:545d748cc681 r5584:545d748cc681 r11847:235c011992a8 r5584:545d748cc681 r5584:545d748cc681 r19229:5550f5cdc59d r10816:2ed0dff886de r12635:3d67c34135d4 r5584:545d748cc681 r15897:d700bcc8403e r15897:d700bcc8403e r15897:d700bcc8403e r15897:d700bcc8403e r15897:d700bcc8403e r20341:d334ae194449 r17360:71e102cec3ce r17360:71e102cec3ce r23436:cfad304b5b27 r23435:0f8f3f8f40ec r23437:6ce81d75a8ed r23435:0f8f3f8f40ec r17884:c09c40617963 r17884:c09c40617963 r12674:8254ab83ecad r14055:e4168a875df8 r12674:8254ab83ecad r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r23287:0e81c2168d96 r15972:6463015373ad r14789:ae5ae13ad9ae r5584:545d748cc681 r5584:545d748cc681 r15797:444e01a3fa29 r6332:7393965b5322 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r10207:a1fc2f2a33db r10696:8dfe83e30d01 r18746:ffe36c655ceb r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r9898:bbef3303e005 r5584:545d748cc681 r5584:545d748cc681 r12930:ae0ddab1903d r5584:545d748cc681 r5584:545d748cc681 r9457:ecfeb802c57a r9457:ecfeb802c57a r9457:ecfeb802c57a r9457:ecfeb802c57a r9457:ecfeb802c57a r9457:ecfeb802c57a r9457:ecfeb802c57a r5584:545d748cc681 | /* $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 misc.cpp Misc functions that shouldn't be here. */
#include "stdafx.h"
#include "landscape.h"
#include "news_func.h"
#include "ai/ai.hpp"
#include "ai/ai_gui.hpp"
#include "newgrf.h"
#include "newgrf_house.h"
#include "economy_func.h"
#include "date_func.h"
#include "texteff.hpp"
#include "gfx_func.h"
#include "gamelog.h"
#include "animated_tile_func.h"
#include "tilehighlight_func.h"
#include "network/network_func.h"
#include "window_func.h"
#include "core/pool_type.hpp"
#include "game/game.hpp"
#include "linkgraph/linkgraphschedule.h"
#include "station_kdtree.h"
#include "town_kdtree.h"
#include "viewport_kdtree.h"
#include "safeguards.h"
extern TileIndex _cur_tileloop_tile;
extern void MakeNewgameSettingsLive();
void InitializeSound();
void InitializeMusic();
void InitializeVehicles();
void InitializeRailGui();
void InitializeRoadGui();
void InitializeAirportGui();
void InitializeDockGui();
void InitializeGraphGui();
void InitializeObjectGui();
void InitializeIndustries();
void InitializeObjects();
void InitializeTrees();
void InitializeCompanies();
void InitializeCheats();
void InitializeNPF();
void InitializeOldNames();
void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settings)
{
/* Make sure there isn't any window that can influence anything
* related to the new game we're about to start/load. */
UnInitWindowSystem();
AllocateMap(size_x, size_y);
_pause_mode = PM_UNPAUSED;
_fast_forward = 0;
_tick_counter = 0;
_cur_tileloop_tile = 1;
_thd.redsq = INVALID_TILE;
if (reset_settings) MakeNewgameSettingsLive();
if (reset_date) {
SetDate(ConvertYMDToDate(_settings_game.game_creation.starting_year, 0, 1), 0);
InitializeOldNames();
}
LinkGraphSchedule::Clear();
PoolBase::Clean(PT_NORMAL);
RebuildStationKdtree();
RebuildTownKdtree();
RebuildViewportKdtree();
ResetPersistentNewGRFData();
InitializeSound();
InitializeMusic();
InitializeVehicles();
InitNewsItemStructs();
InitializeLandscape();
InitializeRailGui();
InitializeRoadGui();
InitializeAirportGui();
InitializeDockGui();
InitializeGraphGui();
InitializeObjectGui();
InitializeAIGui();
InitializeTrees();
InitializeIndustries();
InitializeObjects();
InitializeBuildingCounts();
InitializeNPF();
InitializeCompanies();
AI::Initialize();
Game::Initialize();
InitializeCheats();
InitTextEffects();
NetworkInitChatMessage();
InitializeAnimatedTiles();
InitializeEconomy();
ResetObjectToPlace();
GamelogReset();
GamelogStartAction(GLAT_START);
GamelogRevision();
GamelogMode();
GamelogGRFAddList(_grfconfig);
GamelogStopAction();
}
|