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

Add: Penalty for occupied docking points.

pull/7560/head
peter1138 2019-03-11 13:08:11 +00:00 committed by Niels Martin Hansen
parent ec2656ab7e
commit 31db4f8d5e
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pathfinder/npf/npf.cpp
View File

@ -14,6 +14,7 @@
#include "../../viewport_func.h" #include "../../viewport_func.h"
#include "../../ship.h" #include "../../ship.h"
#include "../../roadstop_base.h" #include "../../roadstop_base.h"
#include "../../vehicle_func.h"
#include "../pathfinder_func.h" #include "../pathfinder_func.h"
#include "../pathfinder_type.h" #include "../pathfinder_type.h"
#include "../follow_track.hpp" #include "../follow_track.hpp"
@ -303,6 +304,15 @@ static void NPFMarkTile(TileIndex tile)
} }
} }
static Vehicle *CountShipProc(Vehicle *v, void *data)
{
uint *count = (uint *)data;
/* Ignore other vehicles (aircraft) and ships inside depot. */
if (v->type == VEH_SHIP && (v->vehstatus & VS_HIDDEN) == 0) (*count)++;
return nullptr;
}
static int32 NPFWaterPathCost(AyStar *as, AyStarNode *current, OpenListNode *parent) static int32 NPFWaterPathCost(AyStar *as, AyStarNode *current, OpenListNode *parent)
{ {
/* TileIndex tile = current->tile; */ /* TileIndex tile = current->tile; */
@ -319,6 +329,13 @@ static int32 NPFWaterPathCost(AyStar *as, AyStarNode *current, OpenListNode *par
cost += _settings_game.pf.npf.npf_water_curve_penalty; cost += _settings_game.pf.npf.npf_water_curve_penalty;
} }
if (IsDockingTile(current->tile)) {
/* Check docking tile for occupancy */
uint count = 1;
HasVehicleOnPos(current->tile, &count, &CountShipProc);
cost += count * 3 * _trackdir_length[trackdir];
}
/* @todo More penalties? */ /* @todo More penalties? */
return cost; return cost;

17
src/pathfinder/yapf/yapf_ship.cpp
View File

@ -12,6 +12,7 @@
#include "../../stdafx.h" #include "../../stdafx.h"
#include "../../ship.h" #include "../../ship.h"
#include "../../industry.h" #include "../../industry.h"
#include "../../vehicle_func.h"
#include "yapf.hpp" #include "yapf.hpp"
#include "yapf_node_ship.hpp" #include "yapf_node_ship.hpp"
@ -261,6 +262,15 @@ public:
return 0; return 0;
} }
static Vehicle *CountShipProc(Vehicle *v, void *data)
{
uint *count = (uint *)data;
/* Ignore other vehicles (aircraft) and ships inside depot. */
if (v->type == VEH_SHIP && (v->vehstatus & VS_HIDDEN) == 0) (*count)++;
return nullptr;
}
/** /**
* Called by YAPF to calculate the cost from the origin to the given node. * Called by YAPF to calculate the cost from the origin to the given node.
* Calculates only the cost of given node, adds it to the parent node cost * Calculates only the cost of given node, adds it to the parent node cost
@ -273,6 +283,13 @@ public:
/* additional penalty for curves */ /* additional penalty for curves */
c += CurveCost(n.m_parent->GetTrackdir(), n.GetTrackdir()); c += CurveCost(n.m_parent->GetTrackdir(), n.GetTrackdir());
if (IsDockingTile(n.GetTile())) {
/* Check docking tile for occupancy */
uint count = 1;
HasVehicleOnPos(n.GetTile(), &count, &CountShipProc);
c += count * 3 * YAPF_TILE_LENGTH;
}
/* Skipped tile cost for aqueducts. */ /* Skipped tile cost for aqueducts. */
c += YAPF_TILE_LENGTH * tf->m_tiles_skipped; c += YAPF_TILE_LENGTH * tf->m_tiles_skipped;