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

(svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. 

- CodeChange: Remove unused variable in CmdSignalTrackHelper.
release/0.4.5
hackykid 2005-06-19 11:56:07 +00:00
parent 3042e945d3
commit 4754dad0d6
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rail_cmd.c
View File

@ -817,7 +817,7 @@ static int32 CmdSignalTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32
{ {
int ex, ey; int ex, ey;
int32 ret, total_cost, signal_ctr; int32 ret, total_cost, signal_ctr;
byte m5, signals; byte signals;
TileIndex tile = TILE_FROM_XY(x, y); TileIndex tile = TILE_FROM_XY(x, y);
bool error = true; bool error = true;
@ -830,6 +830,9 @@ static int32 CmdSignalTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32
if (p1 > MapSize()) return CMD_ERROR; if (p1 > MapSize()) return CMD_ERROR;
if (signal_density == 0 || signal_density > 20) return CMD_ERROR; if (signal_density == 0 || signal_density > 20) return CMD_ERROR;
if (!IsTileType(tile, MP_RAILWAY))
return CMD_ERROR;
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
/* for vertical/horizontal tracks, double the given signals density /* for vertical/horizontal tracks, double the given signals density
@ -846,7 +849,6 @@ static int32 CmdSignalTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32
track = TrackdirToTrack(trackdir); /* trackdir might have changed, keep track in sync */ track = TrackdirToTrack(trackdir); /* trackdir might have changed, keep track in sync */
// copy the signal-style of the first rail-piece if existing // copy the signal-style of the first rail-piece if existing
m5 = _map5[tile];
if (GetRailTileType(tile) == RAIL_TYPE_SIGNALS && GetTrackBits(tile) != 0) { /* XXX: GetTrackBits check useless? */ if (GetRailTileType(tile) == RAIL_TYPE_SIGNALS && GetTrackBits(tile) != 0) { /* XXX: GetTrackBits check useless? */
signals = _map3_lo[tile] & SignalOnTrack(track); signals = _map3_lo[tile] & SignalOnTrack(track);
if (signals == 0) signals = SignalOnTrack(track); /* Can this actually occur? */ if (signals == 0) signals = SignalOnTrack(track); /* Can this actually occur? */
@ -855,18 +857,18 @@ static int32 CmdSignalTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32
} else // no signals exist, drag a two-way signal stretch } else // no signals exist, drag a two-way signal stretch
signals = SignalOnTrack(track); signals = SignalOnTrack(track);
/* signal_ctr - amount of tiles already processed /* signal_ctr - amount of tiles already processed
* signals_density - patch setting to put signal on every Nth tile (double space on |, -- tracks) * signals_density - patch setting to put signal on every Nth tile (double space on |, -- tracks)
********** **********
* trackdir - trackdir to build with autorail * trackdir - trackdir to build with autorail
* semaphores - semaphores or signals * semaphores - semaphores or signals
* signals - is there a signal/semaphore on the first tile, copy its style (two-way/single-way) * signals - is there a signal/semaphore on the first tile, copy its style (two-way/single-way)
and convert all others to semaphore/signal and convert all others to semaphore/signal
* mode - 1 remove signals, 0 build signals */ * mode - 1 remove signals, 0 build signals */
signal_ctr = total_cost = 0; signal_ctr = total_cost = 0;
for (;;) { for (;;) {
// only build/remove signals with the specified density // only build/remove signals with the specified density
if ((signal_ctr % signal_density) == 0 ) { if ((signal_ctr % signal_density) == 0 ) {
ret = DoCommand(x, y, TrackdirToTrack(trackdir) | semaphores, signals, flags, (mode == 1) ? CMD_REMOVE_SIGNALS : CMD_BUILD_SIGNALS); ret = DoCommand(x, y, TrackdirToTrack(trackdir) | semaphores, signals, flags, (mode == 1) ? CMD_REMOVE_SIGNALS : CMD_BUILD_SIGNALS);
/* Abort placement for any other error than NOT_SUITABLE_TRACK /* Abort placement for any other error than NOT_SUITABLE_TRACK