store complete entity in hero

[l2e.git] / src / map / Map.h

diff --git a/src/map/Map.h b/src/map/Map.h
index a1b9cebd593c5dd9f809f8fb1d1edb061b9b0b56..ab0728b765ba8ec363c20d27f3a7e0b9e8e70454 100644 (file)
--- a/src/map/Map.h
+++ b/src/map/Map.h
@@ -24,11 +24,14 @@ public:
 
 public:
        const graphics::Sprite *Tileset() const { return tileset; }
-       const Area &AreaAt(const geometry::Vector<int> &) const;
-       const Tile &TileAt(const geometry::Vector<int> &) const;
+       const Area *AreaAt(const geometry::Vector<int> &) const;
+       const Tile *TileAt(const geometry::Vector<int> &) const;
        Trigger *TriggerAt(const geometry::Vector<int> &);
        geometry::Vector<int> TileCoordinates(const geometry::Vector<int> &) const;
 
+       Entity **EntitiesBegin() { return &entities; }
+       Entity **EntitiesEnd() { return (&entities) + numEntities; }
+
        void Render(SDL_Surface *dest, const geometry::Vector<int> &offset) const;
        void RenderDebug(SDL_Surface *dest, const geometry::Vector<int> &offset) const;
 
@@ -37,6 +40,7 @@ public:
        void SetTileset(const graphics::Sprite *t) { tileset = t; }
        void SetAreas(Area *a, int num) { areas = a; numAreas = num; }
        void SetTriggers(Trigger *t, int num) { triggers = t; numTriggers = num; }
+       void SetEntities(Entity *e, int num) { entities = e; numEntities = num; }
        void SetWidth(int w) { width = w; }
 
 private:
@@ -45,6 +49,8 @@ private:
        int numAreas;
        Trigger *triggers;
        int numTriggers;
+       Entity *entities;
+       int numEntities;
        int width;
 
 };