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/rail_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-04-19 22:48:33 +01:00
parent 54b8eb9b4c 34b68c7a82
commit 3da991bf9b
35 changed files with 480 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rail_gui.cpp
View File

@@ -821,7 +821,7 @@ struct BuildRailToolbarWindow : Window {
break;
case DDSP_CONVERT_RAIL:
DoCommandP(end_tile, start_tile, _cur_railtype | (_ctrl_pressed ? (1 << 5) : 0), CMD_CONVERT_RAIL | CMD_MSG(STR_ERROR_CAN_T_CONVERT_RAIL), CcPlaySound10);
DoCommandP(end_tile, start_tile, _cur_railtype | (_ctrl_pressed ? (1 << 5) : 0), CMD_CONVERT_RAIL | CMD_MSG(STR_ERROR_CAN_T_CONVERT_RAIL), CcPlaySound1E);
break;
case DDSP_REMOVE_STATION: