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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
This commit is contained in:
Jonathan G Rennison
2019-10-05 21:27:20 +01:00
parent 4438413f48 865eea8173
commit edfd378e93
132 changed files with 1354 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings_type.h
View File

@@ -231,7 +231,7 @@ struct SoundSettings {
bool news_ticker; ///< Play a ticker sound when a news item is published.
bool news_full; ///< Play sound effects associated to certain news types.
bool new_year; ///< Play sound on new year, summarising the performance during the last year.
bool confirm; ///< Play sound effect on succesful constructions or other actions.
bool confirm; ///< Play sound effect on successful constructions or other actions.
bool click_beep; ///< Beep on a random selection of buttons.
bool disaster; ///< Play disaster and accident sounds.
bool vehicle; ///< Play vehicle sound effects.