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

(svn r16416) -Fix [FS#2912]: Rework deleting of news when referenced vehicles/stations/industries are deleted.

Browse Source
This commit is contained in:
frosch
2009-05-24 16:52:42 +00:00
parent b7d065ce99
commit a4557c7da4
20 changed files with 216 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/train_cmd.cpp
View File

@@ -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;
}