dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import adjacent crossings patch (v3.1)

Browse Source 
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=836749#p836749
This commit is contained in:
patch-import
2015-08-02 17:08:58 +01:00
committed by Jonathan G Rennison
parent 67366cf03d
commit 4117808b9d
3 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pbs.cpp
View File

@@ -107,8 +107,7 @@ bool TryReserveRailTrack(TileIndex tile, Track t, bool trigger_stations)
case MP_ROAD:
if (IsLevelCrossing(tile) && !HasCrossingReservation(tile)) {
SetCrossingReservation(tile, true);
BarCrossing(tile);
MarkTileDirtyByTile(tile); // crossing barred, make tile dirty
UpdateLevelCrossing(tile, false);
return true;
}
break;

8
src/road_cmd.cpp
View File

@@ -1638,6 +1638,14 @@ static TrackStatus GetTileTrackStatus_Road(TileIndex tile, TransportType mode, u
trackdirbits = TrackBitsToTrackdirBits(AxisToTrackBits(axis));
if (IsCrossingBarred(tile)) red_signals = trackdirbits;
if (IsLevelCrossingTile(TileAddByDiagDir(tile, AxisToDiagDir(axis))) &&
IsCrossingBarred(TileAddByDiagDir(tile, AxisToDiagDir(axis)))) {
red_signals &= (TrackdirBits)0x0102; // magic value. I think TRACKBIT_X_SW and TRACKBIT_X_NE should be swapped
}
if (IsLevelCrossingTile(TileAddByDiagDir(tile, ReverseDiagDir(AxisToDiagDir(axis)))) &&
IsCrossingBarred(TileAddByDiagDir(tile, ReverseDiagDir(AxisToDiagDir(axis))))) {
red_signals &= (TrackdirBits)0x0201; // inverse of above magic value
}
break;
}

50
src/train_cmd.cpp
View File

@@ -1676,19 +1676,31 @@ static bool TrainApproachingCrossing(TileIndex tile)
return HasVehicleOnPos(tile_from, &tile, &TrainApproachingCrossingEnum);
}
/** Check if the crossing should be closed
* @return train on crossing || train approaching crossing || reserved
*/
static inline bool CheckLevelCrossing(TileIndex tile)
{
return HasCrossingReservation(tile) || HasVehicleOnPos(tile, NULL, &TrainOnTileEnum) || TrainApproachingCrossing(tile);
}
/**
* Sets correct crossing state
* @param tile tile to update
* @param sound should we play sound?
* @param force_state force close the crossing due to an adjacent tile
* @pre tile is a rail-road crossing
*/
void UpdateLevelCrossing(TileIndex tile, bool sound)
static void UpdateLevelCrossingTile(TileIndex tile, bool sound, bool force_state = false)
{
assert(IsLevelCrossingTile(tile));
bool new_state;
/* train on crossing || train approaching crossing || reserved */
bool new_state = HasVehicleOnPos(tile, NULL, &TrainOnTileEnum) || TrainApproachingCrossing(tile) || HasCrossingReservation(tile);
if (force_state) {
new_state = force_state;
} else {
new_state = CheckLevelCrossing(tile);
}
if (new_state != IsCrossingBarred(tile)) {
if (new_state && sound) {
@@ -1699,6 +1711,33 @@ void UpdateLevelCrossing(TileIndex tile, bool sound)
}
}
/**
* Cycles the adjacent crossings and sets their state
* @param tile tile to update
* @param sound should we play sound?
*/
void UpdateLevelCrossing(TileIndex tile, bool sound)
{
bool is_forced = false;
if (!IsLevelCrossingTile(tile)) return;
Axis axis = GetCrossingRoadAxis(tile);
for (TileIndex t = tile; !is_forced && IsLevelCrossingTile(t) && GetCrossingRoadAxis(t) == axis; t = TileAddByDiagDir(t, AxisToDiagDir(GetCrossingRoadAxis(t)))) {
is_forced |= CheckLevelCrossing(t);
}
for (TileIndex t = tile; !is_forced && IsLevelCrossingTile(t) && GetCrossingRoadAxis(t) == axis; t = TileAddByDiagDir(t, ReverseDiagDir(AxisToDiagDir(GetCrossingRoadAxis(t))))) {
is_forced |= CheckLevelCrossing(t);
}
for (TileIndex t = tile; IsLevelCrossingTile(t) && GetCrossingRoadAxis(t) == axis; t = TileAddByDiagDir(t, AxisToDiagDir(GetCrossingRoadAxis(t)))) {
UpdateLevelCrossingTile(t, sound, is_forced);
}
for (TileIndex t = tile; IsLevelCrossingTile(t) && GetCrossingRoadAxis(t) == axis; t = TileAddByDiagDir(t, ReverseDiagDir(AxisToDiagDir(GetCrossingRoadAxis(t))))) {
UpdateLevelCrossingTile(t, sound, is_forced);
}
}
/**
* Bars crossing and plays ding-ding sound if not barred already
@@ -1708,9 +1747,8 @@ void UpdateLevelCrossing(TileIndex tile, bool sound)
static inline void MaybeBarCrossingWithSound(TileIndex tile)
{
if (!IsCrossingBarred(tile)) {
BarCrossing(tile);
if (_settings_client.sound.ambient) SndPlayTileFx(SND_0E_LEVEL_CROSSING, tile);
MarkTileDirtyByTile(tile);
SetCrossingReservation(tile, true);
UpdateLevelCrossing(tile, true);
}
}