diff options
| author | tron <tron@openttd.org> | 2006-03-04 11:15:44 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-03-04 11:15:44 +0000 |
| commit | ca0862c3f4baf73549326ec2ec63ac0630cf2c95 (patch) | |
| tree | 4153fe3efc35c3940fcfef3f06a03d78f4f6f97f /train_cmd.c | |
| parent | 332b54d5a6156c192e044163d7f38d87e2801814 (diff) | |
| download | openttd-ca0862c3f4baf73549326ec2ec63ac0630cf2c95.tar.xz | |
(svn r3758) Remove the news validation callback. It is superseded by r3757.
Diffstat (limited to 'train_cmd.c')
| -rw-r--r-- | train_cmd.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/train_cmd.c b/train_cmd.c index cf2450bc2..843bb29ac 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -3272,12 +3272,6 @@ void Train_Tick(Vehicle *v) static const byte _depot_track_ind[4] = {0,1,0,1}; -// Validation for the news item "Train is waiting in depot" -static bool ValidateTrainInDepot( uint data_a, uint data_b ) -{ - Vehicle *v = GetVehicle(data_a); - return (v->u.rail.track == 0x80 && (v->vehstatus | VS_STOPPED)); -} void TrainEnterDepot(Vehicle *v, TileIndex tile) { @@ -3310,12 +3304,12 @@ void TrainEnterDepot(Vehicle *v, TileIndex tile) v->vehstatus |= VS_STOPPED; if (v->owner == _local_player) { SetDParam(0, v->unitnumber); - AddValidatedNewsItem( + AddNewsItem( STR_8814_TRAIN_IS_WAITING_IN_DEPOT, NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0), v->index, - 0, - ValidateTrainInDepot); + 0 + ); } } } @@ -3403,7 +3397,7 @@ void OnNewDay_Train(Vehicle *v) 0); } - CheckOrders(v->index, OC_INIT); + CheckOrders(v); /* update destination */ if (v->current_order.type == OT_GOTO_STATION && |