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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/order_cmd.cpp
#	src/table/settings/news_display_settings.ini
This commit is contained in:
Jonathan G Rennison
2021-11-08 00:44:18 +00:00
parent 10c46946ae c38af72978
commit 3d4261a33a
16 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/roadveh_cmd.cpp
View File

@@ -619,7 +619,13 @@ static void RoadVehCrash(RoadVehicle *v)
SetDParam(0, pass);
StringID newsitem = (pass == 1) ? STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER : STR_NEWS_ROAD_VEHICLE_CRASH;
AddTileNewsItem(newsitem, NT_ACCIDENT, v->tile);
NewsType newstype = NT_ACCIDENT;
if (v->owner != _local_company) {
newstype = NT_ACCIDENT_OTHER;
}
AddTileNewsItem(newsitem, newstype, v->tile);
ModifyStationRatingAround(v->tile, v->owner, -160, 22);
if (_settings_client.sound.disaster) SndPlayVehicleFx(SND_12_EXPLOSION, v);