update to 1.6.1

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2016-07-01 01:42:17 +03:00
parent b42123c570
commit ecdb1590ab
86 changed files with 5892 additions and 533 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: rail_gui.cpp 27427 2015-10-30 17:24:30Z frosch $ */
/* $Id: rail_gui.cpp 27587 2016-05-29 18:52:56Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -710,7 +710,7 @@ struct BuildRailToolbarWindow : Window {
break;
case DDSP_CONVERT_RAIL:
DoCommandP(end_tile, start_tile, _cur_railtype | (_ctrl_pressed ? 0x10 : 0), CMD_CONVERT_RAIL | CMD_MSG(STR_ERROR_CAN_T_CONVERT_RAIL), CcPlaySound10);
DoCommandP(end_tile, start_tile, _cur_railtype | (_ctrl_pressed ? 0x10 : 0), CMD_CONVERT_RAIL | CMD_MSG(STR_ERROR_CAN_T_CONVERT_RAIL), CcPlaySound1E);
break;
case DDSP_REMOVE_STATION: