Files @ r23483:3733e6b8ff17
Branch filter:

Location: cpp/openttd-patchpack/source/src/bridge_map.h - annotation

Patric Stout
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.
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r12768:980ae0491352
r12768:980ae0491352
r12768:980ae0491352
r12768:980ae0491352
r12768:980ae0491352
r12768:980ae0491352
r12768:980ae0491352
r6418:8a4b147a8f33
r6123:049e9624d068
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r8532:0c31796f7b70
r5475:3f5cd13d1b63
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r7928:a80e7e05d6c5
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r6416:1409210e5613
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r21733:9e3a5387d8a6
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6416:1409210e5613
r6418:8a4b147a8f33
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r8532:0c31796f7b70
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r21735:dc929fbec3dd
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r21733:9e3a5387d8a6
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6418:8a4b147a8f33
r5475:3f5cd13d1b63
r18260:9616113792ef
r18246:8bbceed09429
r18246:8bbceed09429
r18246:8bbceed09429
r18246:8bbceed09429
r18246:8bbceed09429
r18260:9616113792ef
r18246:8bbceed09429
r18246:8bbceed09429
r18246:8bbceed09429
r5475:3f5cd13d1b63
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r21733:9e3a5387d8a6
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r21733:9e3a5387d8a6
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6661:a60bd28b4b57
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r8532:0c31796f7b70
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r11247:c15ef8b37f5e
r22972:1584085035e8
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r21735:dc929fbec3dd
r11289:7e06e1b4e52d
r22972:1584085035e8
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r19956:cb96060ee88f
r19956:cb96060ee88f
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6661:a60bd28b4b57
r6418:8a4b147a8f33
r19956:cb96060ee88f
r5475:3f5cd13d1b63
r11247:c15ef8b37f5e
r19956:cb96060ee88f
r19956:cb96060ee88f
r11247:c15ef8b37f5e
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r6418:8a4b147a8f33
r8532:0c31796f7b70
r5475:3f5cd13d1b63
r6661:a60bd28b4b57
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
r9490:5cf190d39c21
r9490:5cf190d39c21
r9490:5cf190d39c21
r9490:5cf190d39c21
r9490:5cf190d39c21
r9490:5cf190d39c21
r9490:5cf190d39c21
r9490:5cf190d39c21
r9490:5cf190d39c21
r9490:5cf190d39c21
r5475:3f5cd13d1b63
r5475:3f5cd13d1b63
/* $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 bridge_map.h Map accessor functions for bridges. */

#ifndef BRIDGE_MAP_H
#define BRIDGE_MAP_H

#include "road_map.h"
#include "bridge.h"

/**
 * Checks if this is a bridge, instead of a tunnel
 * @param t The tile to analyze
 * @pre IsTileType(t, MP_TUNNELBRIDGE)
 * @return true if the structure is a bridge one
 */
static inline bool IsBridge(TileIndex t)
{
	assert(IsTileType(t, MP_TUNNELBRIDGE));
	return HasBit(_m[t].m5, 7);
}

/**
 * checks if there is a bridge on this tile
 * @param t The tile to analyze
 * @return true if a bridge is present
 */
static inline bool IsBridgeTile(TileIndex t)
{
	return IsTileType(t, MP_TUNNELBRIDGE) && IsBridge(t);
}

/**
 * checks if a bridge is set above the ground of this tile
 * @param t The tile to analyze
 * @return true if a bridge is detected above
 */
static inline bool IsBridgeAbove(TileIndex t)
{
	return GB(_m[t].type, 2, 2) != 0;
}

/**
 * Determines the type of bridge on a tile
 * @param t The tile to analyze
 * @pre IsBridgeTile(t)
 * @return The bridge type
 */
static inline BridgeType GetBridgeType(TileIndex t)
{
	assert(IsBridgeTile(t));
	return GB(_me[t].m6, 2, 4);
}

/**
 * Get the axis of the bridge that goes over the tile. Not the axis or the ramp.
 * @param t The tile to analyze
 * @pre IsBridgeAbove(t)
 * @return the above mentioned axis
 */
static inline Axis GetBridgeAxis(TileIndex t)
{
	assert(IsBridgeAbove(t));
	return (Axis)(GB(_m[t].type, 2, 2) - 1);
}

TileIndex GetNorthernBridgeEnd(TileIndex t);
TileIndex GetSouthernBridgeEnd(TileIndex t);
TileIndex GetOtherBridgeEnd(TileIndex t);

int GetBridgeHeight(TileIndex tile);
/**
 * Get the height ('z') of a bridge in pixels.
 * @param tile the bridge ramp tile to get the bridge height from
 * @return the height of the bridge in pixels
 */
static inline int GetBridgePixelHeight(TileIndex tile)
{
	return GetBridgeHeight(tile) * TILE_HEIGHT;
}

/**
 * Remove the bridge over the given axis.
 * @param t the tile to remove the bridge from
 * @param a the axis of the bridge to remove
 */
static inline void ClearSingleBridgeMiddle(TileIndex t, Axis a)
{
	ClrBit(_m[t].type, 2 + a);
}

/**
 * Removes bridges from the given, that is bridges along the X and Y axis.
 * @param t the tile to remove the bridge from
 */
static inline void ClearBridgeMiddle(TileIndex t)
{
	ClearSingleBridgeMiddle(t, AXIS_X);
	ClearSingleBridgeMiddle(t, AXIS_Y);
}

/**
 * Set that there is a bridge over the given axis.
 * @param t the tile to add the bridge to
 * @param a the axis of the bridge to add
 */
static inline void SetBridgeMiddle(TileIndex t, Axis a)
{
	SetBit(_m[t].type, 2 + a);
}

/**
 * Generic part to make a bridge ramp for both roads and rails.
 * @param t          the tile to make a bridge ramp
 * @param o          the new owner of the bridge ramp
 * @param bridgetype the type of bridge this bridge ramp belongs to
 * @param d          the direction this ramp must be facing
 * @param tt         the transport type of the bridge
 * @param rt         the road or rail type
 * @note this function should not be called directly.
 */
static inline void MakeBridgeRamp(TileIndex t, Owner o, BridgeType bridgetype, DiagDirection d, TransportType tt, uint rt)
{
	SetTileType(t, MP_TUNNELBRIDGE);
	SetTileOwner(t, o);
	_m[t].m2 = 0;
	_m[t].m3 = 0;
	_m[t].m4 = 0;
	_m[t].m5 = 1 << 7 | tt << 2 | d;
	SB(_me[t].m6, 2, 4, bridgetype);
	_me[t].m7 = 0;
	_me[t].m8 = rt;
}

/**
 * Make a bridge ramp for roads.
 * @param t          the tile to make a bridge ramp
 * @param o          the new owner of the bridge ramp
 * @param owner_road the new owner of the road on the bridge
 * @param owner_tram the new owner of the tram on the bridge
 * @param bridgetype the type of bridge this bridge ramp belongs to
 * @param d          the direction this ramp must be facing
 * @param r          the road type of the bridge
 */
static inline void MakeRoadBridgeRamp(TileIndex t, Owner o, Owner owner_road, Owner owner_tram, BridgeType bridgetype, DiagDirection d, RoadTypes r)
{
	MakeBridgeRamp(t, o, bridgetype, d, TRANSPORT_ROAD, 0);
	SetRoadOwner(t, ROADTYPE_ROAD, owner_road);
	if (owner_tram != OWNER_TOWN) SetRoadOwner(t, ROADTYPE_TRAM, owner_tram);
	SetRoadTypes(t, r);
}

/**
 * Make a bridge ramp for rails.
 * @param t          the tile to make a bridge ramp
 * @param o          the new owner of the bridge ramp
 * @param bridgetype the type of bridge this bridge ramp belongs to
 * @param d          the direction this ramp must be facing
 * @param r          the rail type of the bridge
 */
static inline void MakeRailBridgeRamp(TileIndex t, Owner o, BridgeType bridgetype, DiagDirection d, RailType r)
{
	MakeBridgeRamp(t, o, bridgetype, d, TRANSPORT_RAIL, r);
}

/**
 * Make a bridge ramp for aqueducts.
 * @param t          the tile to make a bridge ramp
 * @param o          the new owner of the bridge ramp
 * @param d          the direction this ramp must be facing
 */
static inline void MakeAqueductBridgeRamp(TileIndex t, Owner o, DiagDirection d)
{
	MakeBridgeRamp(t, o, 0, d, TRANSPORT_WATER, 0);
}

#endif /* BRIDGE_MAP_H */