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

(svn r8160) -Fix (r8151): Do not use HasSignals on tiles without railways.

release/0.6
maedhros 2007-01-16 17:44:59 +00:00
parent 6908565067
commit eeaf5c1f1c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/rail_gui.cpp
View File

@ -183,7 +183,7 @@ static void GenericPlaceSignals(TileIndex tile)
if (!_remove_button_clicked) { if (!_remove_button_clicked) {
uint32 p1 = _ctrl_pressed ? 8 : 0; uint32 p1 = _ctrl_pressed ? 8 : 0;
if (!HasSignals(tile) && _cur_year < _patches.semaphore_build_before) { if (IsTileType(tile, MP_RAILWAY) && !HasSignals(tile) && _cur_year < _patches.semaphore_build_before) {
/* Reverse the logic, so semaphores are normally built, and light /* Reverse the logic, so semaphores are normally built, and light
* signals can be built with ctrl held down. */ * signals can be built with ctrl held down. */
p1 = _ctrl_pressed ? 0 : 8; p1 = _ctrl_pressed ? 0 : 8;
@ -374,7 +374,8 @@ static void HandleAutoSignalPlacement(void)
return; return;
} }
if (!HasSignals(TileVirtXY(thd->selstart.x, thd->selstart.y)) && _cur_year < _patches.semaphore_build_before) { TileIndex start_tile = TileVirtXY(thd->selstart.x, thd->selstart.y);
if (IsTileType(start_tile, MP_RAILWAY) && !HasSignals(start_tile) && _cur_year < _patches.semaphore_build_before) {
/* Reverse the logic, so semaphores are normally built, and light /* Reverse the logic, so semaphores are normally built, and light
* signals can be built with ctrl held down. */ * signals can be built with ctrl held down. */
semaphore = _ctrl_pressed ? 0 : 1; semaphore = _ctrl_pressed ? 0 : 1;
@ -383,7 +384,7 @@ static void HandleAutoSignalPlacement(void)
// _patches.drag_signals_density is given as a parameter such that each user in a network // _patches.drag_signals_density is given as a parameter such that each user in a network
// game can specify his/her own signal density // game can specify his/her own signal density
DoCommandP( DoCommandP(
TileVirtXY(thd->selstart.x, thd->selstart.y), start_tile,
TileVirtXY(thd->selend.x, thd->selend.y), TileVirtXY(thd->selend.x, thd->selend.y),
(semaphore << 3) | (trackstat << 4) | (_patches.drag_signals_density << 24), (semaphore << 3) | (trackstat << 4) | (_patches.drag_signals_density << 24),
CcPlaySound1E, CcPlaySound1E,