summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-05 00:15:27 +0100
committerIra Rice <irarice@gmail.com>2009-01-05 20:43:04 -0700
commit4b540f3007e18a85a6d31d301526217393792451 (patch)
tree0cd424a18cf65505e32507a9c356a7182f0a489d /src/map.h
parentb6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7 (diff)
downloadmana-4b540f3007e18a85a6d31d301526217393792451.tar.gz
mana-4b540f3007e18a85a6d31d301526217393792451.tar.bz2
mana-4b540f3007e18a85a6d31d301526217393792451.tar.xz
mana-4b540f3007e18a85a6d31d301526217393792451.zip
Renamed PATH_NODE to Position as on mainline
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/map.h b/src/map.h
index 6eaf9e43..56183abf 100644
--- a/src/map.h
+++ b/src/map.h
@@ -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.