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

(svn r2447) * Add: [NPF] Penalty for road vehicles making turns.

Browse Source
This commit is contained in:
matthijs
2005-06-16 17:53:40 +00:00
parent 9d61f5efe8
commit 65de40f547
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
npf.c
View File

@@ -322,8 +322,10 @@ int32 NPFRoadPathCost(AyStar* as, AyStarNode* current, OpenListNode* parent) {
/* Check for slope */ /* Check for slope */
cost += NPFSlopeCost(current); cost += NPFSlopeCost(current);
/* Check for turns */ /* Check for turns. Road vehicles only really drive diagonal, turns are
//TODO * represented by non-diagonal tracks */
if (!IsDiagonalTrackdir(current->direction))
cost += _patches.npf_road_curve_penalty;
NPFMarkTile(tile); NPFMarkTile(tile);
DEBUG(npf, 4)("Calculating G for: (%d, %d). Result: %d", TileX(current->tile), TileY(current->tile), cost); DEBUG(npf, 4)("Calculating G for: (%d, %d). Result: %d", TileX(current->tile), TileY(current->tile), cost);

2
settings.c
View File

@@ -975,6 +975,8 @@ const SettingDesc patch_settings[] = {
* rail curve penalty, since ships (realisticly) have more trouble with * rail curve penalty, since ships (realisticly) have more trouble with
* making turns */ * making turns */
{"npf_water_curve_penalty", SDT_UINT32, (void*)(NPF_TILE_LENGTH / 4), &_patches.npf_water_curve_penalty, NULL}, {"npf_water_curve_penalty", SDT_UINT32, (void*)(NPF_TILE_LENGTH / 4), &_patches.npf_water_curve_penalty, NULL},
/* This is the penalty for road, same as for rail. */
{"npf_road_curve_penalty", SDT_UINT32, (void*)(1), &_patches.npf_road_curve_penalty, NULL},
{NULL, 0, NULL, NULL, NULL} {NULL, 0, NULL, NULL, NULL}
}; };

1
variables.h
View File

@@ -215,6 +215,7 @@ typedef struct Patches {
uint32 npf_rail_depot_reverse_penalty; /* The penalty for reversing in depots */ uint32 npf_rail_depot_reverse_penalty; /* The penalty for reversing in depots */
uint32 npf_buoy_penalty; /* The penalty for going over (through) a buoy */ uint32 npf_buoy_penalty; /* The penalty for going over (through) a buoy */
uint32 npf_water_curve_penalty; /* The penalty for curves */ uint32 npf_water_curve_penalty; /* The penalty for curves */
uint32 npf_road_curve_penalty; /* The penalty for curves */
bool population_in_label; // Show the population of a town in his label? bool population_in_label; // Show the population of a town in his label?
} Patches; } Patches;