mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r3877) Add functions to turn a tile into a rail/road bridge ramp/middle part

release/0.5
tron 2006-03-15 07:10:41 +00:00
parent decf3c42f8
commit 251242165c
3 changed files with 72 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
bridge_map.h
View File

@ -47,4 +47,51 @@ static inline void SetRoadUnderBridge(TileIndex t, Owner o)
SB(_m[t].m5, 3, 3, 1 << 2 | TRANSPORT_ROAD); SB(_m[t].m5, 3, 3, 1 << 2 | TRANSPORT_ROAD);
} }
static inline void MakeBridgeRamp(TileIndex t, Owner o, uint bridgetype, DiagDirection d, TransportType tt)
{
uint northsouth = (d == DIAGDIR_NE || d == DIAGDIR_NW);
SetTileType(t, MP_TUNNELBRIDGE);
SetTileOwner(t, o);
_m[t].m2 = bridgetype << 4;
_m[t].m4 = 0;
_m[t].m5 = 1 << 7 | 0 << 6 | northsouth << 5 | tt << 1 | DiagDirToAxis(d);
}
static inline void MakeRoadBridgeRamp(TileIndex t, Owner o, uint bridgetype, DiagDirection d)
{
MakeBridgeRamp(t, o, bridgetype, d, TRANSPORT_ROAD);
_m[t].m3 = 0;
}
static inline void MakeRailBridgeRamp(TileIndex t, Owner o, uint bridgetype, DiagDirection d, RailType r)
{
MakeBridgeRamp(t, o, bridgetype, d, TRANSPORT_RAIL);
_m[t].m3 = r;
}
static inline void MakeBridgeMiddle(TileIndex t, uint bridgetype, uint piece, Axis a, TransportType tt)
{
SetTileType(t, MP_TUNNELBRIDGE);
SetTileOwner(t, OWNER_NONE);
_m[t].m2 = bridgetype << 4 | piece;
_m[t].m3 = 0;
_m[t].m4 = 0;
_m[t].m5 = 1 << 7 | 1 << 6 | 0 << 5 | 0 << 3 | tt << 1 | a;
}
static inline void MakeRoadBridgeMiddle(TileIndex t, uint bridgetype, uint piece, Axis a)
{
MakeBridgeMiddle(t, bridgetype, piece, a, TRANSPORT_ROAD);
}
static inline void MakeRailBridgeMiddle(TileIndex t, uint bridgetype, uint piece, Axis a, RailType r)
{
MakeBridgeMiddle(t, bridgetype, piece, a, TRANSPORT_RAIL);
SB(_m[t].m3, 4, 4, r);
}
#endif #endif

10
direction.h
View File

@ -102,4 +102,14 @@ static inline Axis DiagDirToAxis(DiagDirection d)
return (Axis)(d & 1); return (Axis)(d & 1);
} }
/*
* Converts an Axis to a DiagDirection
* Points always in the positive direction, i.e. S[EW]
*/
static inline DiagDirection AxisToDiagDir(Axis a)
{
return (DiagDirection)(2 - a);
}
#endif #endif

37
tunnelbridge_cmd.c
View File

@ -309,23 +309,17 @@ int32 CmdBuildBridge(int x, int y, uint32 flags, uint32 p1, uint32 p2)
/* do the drill? */ /* do the drill? */
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
/* build the start tile */ DiagDirection dir = AxisToDiagDir(direction);
ModifyTile(ti_start.tile,
MP_SETTYPE(MP_TUNNELBRIDGE) |
MP_MAP2 | MP_MAP3LO | MP_MAPOWNER_CURRENT | MP_MAP5,
(bridge_type << 4), /* map2 */
railtype, /* map3_lo */
0x80 | direction | transport << 1 /* map5 */
);
/* build the end tile */ if (transport == TRANSPORT_RAIL) {
ModifyTile(ti_end.tile, MakeRailBridgeRamp(ti_start.tile, _current_player, bridge_type, dir, railtype);
MP_SETTYPE(MP_TUNNELBRIDGE) | MakeRailBridgeRamp(ti_end.tile, _current_player, bridge_type, ReverseDiagDir(dir), railtype);
MP_MAP2 | MP_MAP3LO | MP_MAPOWNER_CURRENT | MP_MAP5, } else {
(bridge_type << 4), /* map2 */ MakeRoadBridgeRamp(ti_start.tile, _current_player, bridge_type, dir);
railtype, /* map3_lo */ MakeRoadBridgeRamp(ti_end.tile, _current_player, bridge_type, ReverseDiagDir(dir));
0x80 | 0x20 | direction | transport << 1 /* map5 */ }
); MarkTileDirtyByTile(ti_start.tile);
MarkTileDirtyByTile(ti_end.tile);
} }
// position of middle part of the odd bridge (larger than MAX(i) otherwise) // position of middle part of the odd bridge (larger than MAX(i) otherwise)
@ -380,12 +374,9 @@ not_valid_below:;
break; break;
} }
/* do middle part of bridge */
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
uint piece; uint piece;
SetTileType(tile, MP_TUNNELBRIDGE);
//bridges pieces sequence (middle parts) //bridges pieces sequence (middle parts)
// bridge len 1: 0 // bridge len 1: 0
// bridge len 2: 0 1 // bridge len 2: 0 1
@ -411,9 +402,11 @@ not_valid_below:;
piece = 2 + ((i % 2 == 0) ^ (i > odd_middle_part)); piece = 2 + ((i % 2 == 0) ^ (i > odd_middle_part));
} }
_m[tile].m2 = (bridge_type << 4) | piece; if (transport == TRANSPORT_RAIL) {
SB(_m[tile].m3, 4, 4, railtype); MakeRailBridgeMiddle(tile, bridge_type, piece, direction, railtype);
_m[tile].m5 = 0xC0 | transport << 1 | direction; } else {
MakeRoadBridgeMiddle(tile, bridge_type, piece, direction);
}
switch (transport_under) { switch (transport_under) {
case TRANSPORT_RAIL: SetRailUnderBridge(tile, owner_under, rail_under); break; case TRANSPORT_RAIL: SetRailUnderBridge(tile, owner_under, rail_under); break;
case TRANSPORT_ROAD: SetRoadUnderBridge(tile, owner_under); break; case TRANSPORT_ROAD: SetRoadUnderBridge(tile, owner_under); break;