summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/map.h b/src/map.h
index 31c6be00..c4a4fc0b 100644
--- a/src/map.h
+++ b/src/map.h
@@ -27,6 +27,7 @@
#include <list>
#include <vector>
+#include "position.h"
#include "properties.h"
class AmbientOverlay;
@@ -37,8 +38,6 @@ class Particle;
class Sprite;
class Tileset;
-struct PATH_NODE;
-
typedef std::vector<Tileset*> Tilesets;
typedef std::list<Sprite*> Sprites;
typedef Sprites::iterator SpriteIterator;
@@ -189,11 +188,6 @@ class Map : public Properties
void blockTile(int x, int y, BlockType type);
/**
- * Marks a tile as unoccupied
- */
- void freeTile(int x, int y, BlockType type);
-
- /**
* Gets walkability for a tile with a blocking bitmask. When called
* without walkmask, only blocks against colliding tiles.
*/
@@ -226,8 +220,8 @@ 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, unsigned char walkmask, int maxCost = 20);
+ Path findPath(int startX, int startY, int destX, int destY,
+ unsigned char walkmask, int maxCost = 20);
/**
* Adds a sprite to the map.