diff options
author | frosch <frosch@openttd.org> | 2009-05-24 16:52:42 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2009-05-24 16:52:42 +0000 |
commit | a4557c7da4329188e3561d9404891c0346f8f70e (patch) | |
tree | 96e7ba45ee42e5b0d0c8ca2867b081a56ebef645 /src/train_cmd.cpp | |
parent | b7d065ce99886e2cf86883469a077f653428e5b8 (diff) | |
download | openttd-a4557c7da4329188e3561d9404891c0346f8f70e.tar.xz |
(svn r16416) -Fix [FS#2912]: Rework deleting of news when referenced vehicles/stations/industries are deleted.
Diffstat (limited to 'src/train_cmd.cpp')
-rw-r--r-- | src/train_cmd.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index e1b7f5f89..481064abf 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2987,11 +2987,11 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir, AI::NewEvent(v->owner, new AIEventVehicleLost(v->index)); if (_settings_client.gui.lost_train_warn && v->owner == _local_company) { SetDParam(0, v->index); - AddNewsItem( + AddVehicleNewsItem( STR_TRAIN_IS_LOST, NS_ADVICE, - v->index, - 0); + v->index + ); } } } else { @@ -3357,7 +3357,7 @@ static void TrainEnterStation(Train *v, StationID station) if (!(st->had_vehicle_of_type & HVOT_TRAIN)) { st->had_vehicle_of_type |= HVOT_TRAIN; SetDParam(0, st->index); - AddNewsItem( + AddVehicleNewsItem( STR_NEWS_FIRST_TRAIN_ARRIVAL, v->owner == _local_company ? NS_ARRIVAL_COMPANY : NS_ARRIVAL_OTHER, v->index, @@ -3615,10 +3615,9 @@ static bool CheckTrainCollision(Train *v) if (tcc.num == 0) return false; SetDParam(0, tcc.num); - AddNewsItem(STR_NEWS_TRAIN_CRASH, - NS_ACCIDENT_VEHICLE, - v->index, - 0 + AddVehicleNewsItem(STR_NEWS_TRAIN_CRASH, + NS_ACCIDENT, + v->index ); ModifyStationRatingAround(v->tile, v->owner, -160, 30); @@ -4328,11 +4327,11 @@ static bool TrainLocoHandler(Train *v, bool mode) /* Show message to player. */ if (_settings_client.gui.lost_train_warn && v->owner == _local_company) { SetDParam(0, v->index); - AddNewsItem( + AddVehicleNewsItem( STR_TRAIN_IS_STUCK, NS_ADVICE, - v->index, - 0); + v->index + ); } v->load_unload_time_rem = 0; } |