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

Codechange: Simplified YAPF ship region node

pull/13077/head
Koen Bussemaker 2024-10-12 19:10:09 +02:00 committed by Kuhnovic
parent 3e195df3c7
commit 6faf4fa70a
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,16 +40,10 @@ inline uint ManhattanDistance(const CYapfRegionPatchNodeKey &a, const CYapfRegio
/** Yapf Node for water regions. */ /** Yapf Node for water regions. */
template <class Tkey_> template <class Tkey_>
struct CYapfRegionNodeT { struct CYapfRegionNodeT : CYapfNodeT<Tkey_, CYapfRegionNodeT<Tkey_> > {
typedef Tkey_ Key; typedef Tkey_ Key;
typedef CYapfRegionNodeT<Tkey_> Node; typedef CYapfRegionNodeT<Tkey_> Node;
Tkey_ key;
Node *hash_next;
Node *parent;
int cost;
int estimate;
inline void Set(Node *parent, const WaterRegionPatchDesc &water_region_patch) inline void Set(Node *parent, const WaterRegionPatchDesc &water_region_patch)
{ {
this->key.Set(water_region_patch); this->key.Set(water_region_patch);
@ -66,7 +60,7 @@ struct CYapfRegionNodeT {
DiagDirection GetDiagDirFromParent() const DiagDirection GetDiagDirFromParent() const
{ {
if (!this->parent) return INVALID_DIAGDIR; if (this->parent == nullptr) return INVALID_DIAGDIR;
const int dx = this->key.water_region_patch.x - this->parent->key.water_region_patch.x; const int dx = this->key.water_region_patch.x - this->parent->key.water_region_patch.x;
const int dy = this->key.water_region_patch.y - this->parent->key.water_region_patch.y; const int dy = this->key.water_region_patch.y - this->parent->key.water_region_patch.y;
if (dx > 0 && dy == 0) return DIAGDIR_SW; if (dx > 0 && dy == 0) return DIAGDIR_SW;
@ -75,13 +69,6 @@ struct CYapfRegionNodeT {
if (dx == 0 && dy < 0) return DIAGDIR_NW; if (dx == 0 && dy < 0) return DIAGDIR_NW;
return INVALID_DIAGDIR; return INVALID_DIAGDIR;
} }
inline Node *GetHashNext() { return this->hash_next; }
inline void SetHashNext(Node *pNext) { this->hash_next = pNext; }
inline const Tkey_ &GetKey() const { return this->key; }
inline int GetCost() { return this->cost; }
inline int GetCostEstimate() { return this->estimate; }
inline bool operator<(const Node &other) const { return this->estimate < other.estimate; }
}; };
/** YAPF origin for water regions. */ /** YAPF origin for water regions. */