miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.11

Browse Source
This commit is contained in:
dP
2021-03-24 23:07:53 +03:00
parent fdcd6d6444 6f8e0c144b
commit 1859af4a63
36 changed files with 2646 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/airport_gui.cpp
+3 -3
View File
@@ -57,7 +57,7 @@ void CcBuildAirport(const CommandCost &result, TileIndex tile, uint32 p1, uint32
*/
static void PlaceAirport(TileIndex tile)
{
if (_settings_client.gui.cm_use_improved_station_join) {
if (citymania::UseImprovedStationJoin()) {
citymania::PlaceAirport(tile);
return;
}
@@ -117,14 +117,14 @@ struct BuildAirToolbarWindow : Window {
{
switch (widget) {
case WID_AT_AIRPORT:
if (HandlePlacePushButton(this, WID_AT_AIRPORT, SPR_CURSOR_AIRPORT, HT_RECT)) {
if (HandlePlacePushButton(this, WID_AT_AIRPORT, SPR_CURSOR_AIRPORT, HT_RECT, CM_DDSP_BUILD_AIRPORT)) {
ShowBuildAirportPicker(this);
this->last_user_action = widget;
}
break;
case WID_AT_DEMOLISH:
HandlePlacePushButton(this, WID_AT_DEMOLISH, ANIMCURSOR_DEMOLISH, HT_RECT | HT_DIAGONAL);
HandlePlacePushButton(this, WID_AT_DEMOLISH, ANIMCURSOR_DEMOLISH, HT_RECT | HT_DIAGONAL, CM_DDSP_DEMOLISH);
this->last_user_action = widget;
break;