diff options
Diffstat (limited to 'src/pathfinder')
-rw-r--r-- | src/pathfinder/yapf/yapf_node.hpp | 17 | ||||
-rw-r--r-- | src/pathfinder/yapf/yapf_node_ship.hpp | 32 | ||||
-rw-r--r-- | src/pathfinder/yapf/yapf_ship.cpp | 1 |
3 files changed, 33 insertions, 17 deletions
diff --git a/src/pathfinder/yapf/yapf_node.hpp b/src/pathfinder/yapf/yapf_node.hpp index 0ed3748e5..0eb9802de 100644 --- a/src/pathfinder/yapf/yapf_node.hpp +++ b/src/pathfinder/yapf/yapf_node.hpp @@ -81,21 +81,4 @@ struct CYapfNodeT { } }; -/** Yapf Node for ships */ -template <class Tkey_> -struct CYapfShipNodeT - : CYapfNodeT<Tkey_, CYapfShipNodeT<Tkey_> > -{ - -}; - -/* now define two major node types (that differ by key type) */ -typedef CYapfShipNodeT<CYapfNodeKeyExitDir> CYapfShipNodeExitDir; -typedef CYapfShipNodeT<CYapfNodeKeyTrackDir> CYapfShipNodeTrackDir; - -/* Default NodeList types */ -typedef CNodeList_HashTableT<CYapfShipNodeExitDir , 14, 16> CShipNodeListExitDir; -typedef CNodeList_HashTableT<CYapfShipNodeTrackDir, 16, 20> CShipNodeListTrackDir; - - #endif /* YAPF_NODE_HPP */ diff --git a/src/pathfinder/yapf/yapf_node_ship.hpp b/src/pathfinder/yapf/yapf_node_ship.hpp new file mode 100644 index 000000000..3fbc299f7 --- /dev/null +++ b/src/pathfinder/yapf/yapf_node_ship.hpp @@ -0,0 +1,32 @@ +/* $Id$ */ + +/* + * This file is part of OpenTTD. + * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. + * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. + */ + +/** @file yapf_node_ship.hpp Node tailored for ship pathfinding. */ + +#ifndef YAPF_NODE_SHIP_HPP +#define YAPF_NODE_SHIP_HPP + +/** Yapf Node for ships */ +template <class Tkey_> +struct CYapfShipNodeT + : CYapfNodeT<Tkey_, CYapfShipNodeT<Tkey_> > +{ + +}; + +/* now define two major node types (that differ by key type) */ +typedef CYapfShipNodeT<CYapfNodeKeyExitDir> CYapfShipNodeExitDir; +typedef CYapfShipNodeT<CYapfNodeKeyTrackDir> CYapfShipNodeTrackDir; + +/* Default NodeList types */ +typedef CNodeList_HashTableT<CYapfShipNodeExitDir , 14, 16> CShipNodeListExitDir; +typedef CNodeList_HashTableT<CYapfShipNodeTrackDir, 16, 20> CShipNodeListTrackDir; + + +#endif /* YAPF_NODE_SHIP_HPP */ diff --git a/src/pathfinder/yapf/yapf_ship.cpp b/src/pathfinder/yapf/yapf_ship.cpp index 51fc84944..69f1ce2c5 100644 --- a/src/pathfinder/yapf/yapf_ship.cpp +++ b/src/pathfinder/yapf/yapf_ship.cpp @@ -13,6 +13,7 @@ #include "../../ship.h" #include "yapf.hpp" +#include "yapf_node_ship.hpp" /** Node Follower module of YAPF for ships */ template <class Types> |