From 3fe1772b1e00344365e3cf8204225be19925b9e5 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Thu, 9 Oct 2008 19:42:13 +0000 Subject: Merged the movement branch into trunk I consider this the only way forward. In my tests this code isn't actually doing worse than what was there before. Of course some cases are a bit broken, and I'm open to any kind of feedback so that we can fix those issues. --- src/map.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/map.h') 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 #include +#include "position.h" #include "properties.h" class AmbientOverlay; @@ -37,8 +38,6 @@ class Particle; class Sprite; class Tileset; -struct PATH_NODE; - typedef std::vector Tilesets; typedef std::list Sprites; typedef Sprites::iterator SpriteIterator; @@ -188,11 +187,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 - 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. -- cgit v1.2.3-70-g09d2