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

(svn r19369) -Codechange: EnsureNoTrainOnTrackBits() returns a CommandCost now.

Browse Source
This commit is contained in:
alberth
2010-03-07 18:24:41 +00:00
parent 2044c94217
commit b04de719b3
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vehicle.cpp
View File

@@ -472,15 +472,15 @@ static Vehicle *EnsureNoTrainOnTrackProc(Vehicle *v, void *data)
* @param track_bits The track bits.
* @return \c true if no train that interacts, is found. \c false if a train is found.
*/
bool EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits)
CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits)
{
/* Value v is not safe in MP games, however, it is used to generate a local
* error message only (which may be different for different machines).
* Such a message does not affect MP synchronisation.
*/
Vehicle *v = VehicleFromPos(tile, &track_bits, &EnsureNoTrainOnTrackProc, true);
if (v != NULL) _error_message = STR_ERROR_TRAIN_IN_THE_WAY + v->type;
return v == NULL;
if (v != NULL) return_cmd_error(STR_ERROR_TRAIN_IN_THE_WAY + v->type);
return CommandCost();
}
static void UpdateNewVehiclePosHash(Vehicle *v, bool remove)