mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21121) -Fix (r21100): Use the cached max speed when calculating YAPF penalties for road vehicles.

release/1.1
terkhen 2010-11-09 17:36:40 +00:00
parent c6ad6f52a9
commit e08aa7e8e6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pathfinder/yapf/yapf_road.cpp
View File

@ -140,9 +140,10 @@ public:
/* add min/max speed penalties */
int min_speed = 0;
int max_veh_speed = v->GetDisplayMaxSpeed();
int max_speed = F.GetSpeedLimit(&min_speed);
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);
if (max_speed < max_veh_speed) segment_cost += 1 * (max_veh_speed - max_speed);
if (min_speed > max_veh_speed) segment_cost += 10 * (min_speed - max_veh_speed);
/* move to the next tile */
tile = F.m_new_tile;