made targetless camera possible

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

diff --git a/src/map/Map.h b/src/map/Map.h
index 8c2804d0b3641a5493aa4cbac83243cc6b97ae27..40cce1c497259e31a719a4bcf3114c2ded2478b7 100644 (file)
--- a/src/map/Map.h
+++ b/src/map/Map.h
@@ -8,6 +8,7 @@
 #ifndef MAP_MAP_H_
 #define MAP_MAP_H_
 
+#include "Entity.h"
 #include "fwd.h"
 #include "../geometry/Vector.h"
 #include "../graphics/fwd.h"
@@ -24,13 +25,16 @@ 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;
+       Area *AreaAt(const geometry::Vector<int> &);
+       const Area *AreaAt(const geometry::Vector<int> &) const;
+       Tile *TileAt(const geometry::Vector<int> &);
+       const Tile *TileAt(const geometry::Vector<int> &) const;
        Trigger *TriggerAt(const geometry::Vector<int> &);
+       SDL_Surface *BattleBackgroundAt(const geometry::Vector<int> &);
        geometry::Vector<int> TileCoordinates(const geometry::Vector<int> &) const;
 
-       Entity **EntitiesBegin() { return &entities; }
-       Entity **EntitiesEnd() { return (&entities) + numEntities; }
+       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;
@@ -38,6 +42,7 @@ public:
 // temporary setters
 public:
        void SetTileset(const graphics::Sprite *t) { tileset = t; }
+       void SetBattleBackground(SDL_Surface *bg) { battlebg = bg; }
        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; }
@@ -45,6 +50,7 @@ public:
 
 private:
        const graphics::Sprite *tileset;
+       SDL_Surface *battlebg;
        Area *areas;
        int numAreas;
        Trigger *triggers;