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

(svn r19366) -Codechange: Move setting of _error_message from the callback check routine to the caller.

Browse Source
This commit is contained in:
alberth
2010-03-07 16:10:40 +00:00
parent 29b79e03e8
commit 6eac50bc16
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vehicle.cpp
View File

@@ -461,7 +461,6 @@ static Vehicle *EnsureNoTrainOnTrackProc(Vehicle *v, void *data)
Train *t = Train::From(v); Train *t = Train::From(v);
if ((t->track != rail_bits) && !TracksOverlap(t->track | rail_bits)) return NULL; if ((t->track != rail_bits) && !TracksOverlap(t->track | rail_bits)) return NULL;
_error_message = STR_ERROR_TRAIN_IN_THE_WAY + v->type;
return v; return v;
} }
@@ -475,7 +474,13 @@ static Vehicle *EnsureNoTrainOnTrackProc(Vehicle *v, void *data)
*/ */
bool EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits) bool EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits)
{ {
return !HasVehicleOnPos(tile, &track_bits, &EnsureNoTrainOnTrackProc); /* 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;
} }
static void UpdateNewVehiclePosHash(Vehicle *v, bool remove) static void UpdateNewVehiclePosHash(Vehicle *v, bool remove)