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

Merge 1.7.0-RC1

Browse Source
This commit is contained in:
Pavel Stupnikov
2017-04-09 22:34:33 +03:00
parent 20c478da3f 3433ae02f4
commit 2a02067397
262 changed files with 4673 additions and 3860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/road_cmd.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: road_cmd.cpp 27312 2015-06-21 09:31:50Z frosch $ */
/* $Id: road_cmd.cpp 27746 2017-02-12 12:03:07Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -224,7 +224,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec
TileIndex other_end = GetOtherTunnelBridgeEnd(tile);
/* Pay for *every* tile of the bridge or tunnel */
uint len = GetTunnelBridgeLength(other_end, tile) + 2;
cost.AddCost(len * _price[PR_CLEAR_ROAD]);
cost.AddCost(len * 2 * _price[PR_CLEAR_ROAD]);
if (flags & DC_EXEC) {
Company *c = Company::GetIfValid(GetRoadOwner(tile, rt));
if (c != NULL) {
@@ -1684,6 +1684,7 @@ static void GetTileDesc_Road(TileIndex tile, TileDesc *td)
if (HasBit(rts, ROADTYPE_TRAM)) tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM);
const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
td->railtype = rti->strings.name;
td->rail_speed = rti->max_speed;
break;