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

(svn r8735) -Feature: drive-through road stops made possible by the hard work of mart3p.

Browse Source
This commit is contained in:
rubidium
2007-02-14 16:37:16 +00:00
parent 39b73119ca
commit 0e8f006dc1
26 changed files with 372 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/yapf/yapf_road.cpp
View File

@@ -51,6 +51,10 @@ protected:
if (IsLevelCrossing(tile))
cost += Yapf().PfGetSettings().road_crossing_penalty;
break;
case MP_STATION:
if (IsDriveThroughStopTile(tile))
cost += Yapf().PfGetSettings().road_stop_penalty;
break;
default:
break;
@@ -76,6 +80,10 @@ public:
// base tile cost depending on distance between edges
segment_cost += Yapf().OneTileCost(tile, trackdir);
const Vehicle* v = Yapf().GetVehicle();
// we have reached the vehicle's destination - segment should end here to avoid target skipping
if (v->current_order.type == OT_GOTO_STATION && tile == v->dest_tile) break;
// stop if we have just entered the depot
if (IsTileDepotType(tile, TRANSPORT_ROAD) && trackdir == DiagdirToDiagTrackdir(ReverseDiagDir(GetRoadDepotDirection(tile)))) {
// next time we will reverse and leave the depot
@@ -103,7 +111,6 @@ public:
// add min/max speed penalties
int min_speed = 0;
int max_speed = F.GetSpeedLimit(&min_speed);
const Vehicle* v = Yapf().GetVehicle();
if (max_speed < v->max_speed) segment_cost += 1 * (v->max_speed - max_speed);
if (min_speed > v->max_speed) segment_cost += 10 * (min_speed - v->max_speed);