diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-05 00:15:27 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-05 00:15:27 +0100 |
commit | 12d4837d4d8bb6cbb5d4cd4199bb77b76108fa51 (patch) | |
tree | 3ceed68ebd672f564c11818efb0a793e43f0acc7 /src/map.h | |
parent | 81ca2120284ac7fd84e22ee61545b2b789f982e7 (diff) | |
download | mana-12d4837d4d8bb6cbb5d4cd4199bb77b76108fa51.tar.gz mana-12d4837d4d8bb6cbb5d4cd4199bb77b76108fa51.tar.bz2 mana-12d4837d4d8bb6cbb5d4cd4199bb77b76108fa51.tar.xz mana-12d4837d4d8bb6cbb5d4cd4199bb77b76108fa51.zip |
Renamed PATH_NODE to Position as on mainline
Diffstat (limited to 'src/map.h')
-rw-r--r-- | src/map.h | 20 |
1 files changed, 9 insertions, 11 deletions
@@ -25,6 +25,7 @@ #include <list> #include <vector> +#include "position.h" #include "properties.h" class AmbientOverlay; @@ -35,8 +36,6 @@ class Particle; class Sprite; class Tileset; -struct PATH_NODE; - typedef std::vector<Tileset*> Tilesets; typedef std::list<Sprite*> Sprites; typedef Sprites::iterator SpriteIterator; @@ -55,13 +54,13 @@ struct MetaTile MetaTile():whichList(0) {}; // Pathfinding members - int Fcost; /**< Estimation of total path cost */ - int Gcost; /**< Cost from start to this location */ - int Hcost; /**< Estimated cost to goal */ - int whichList; /**< No list, open list or closed list */ - int parentX; /**< X coordinate of parent tile */ - int parentY; /**< Y coordinate of parent tile */ - bool walkable; /**< Can beings walk on this tile */ + int Fcost; /**< Estimation of total path cost */ + int Gcost; /**< Cost from start to this location */ + int Hcost; /**< Estimated cost to goal */ + int whichList; /**< No list, open list or closed list */ + int parentX; /**< X coordinate of parent tile */ + int parentY; /**< Y coordinate of parent tile */ + bool walkable; /**< Can beings walk on this tile */ }; /** @@ -204,8 +203,7 @@ class Map : public Properties /** * Find a path from one location to the next. */ - std::list<PATH_NODE> - findPath(int startX, int startY, int destX, int destY); + Path findPath(int startX, int startY, int destX, int destY); /** * Adds a sprite to the map. |