renamed app::State's Resize -> OnResize

[l2e.git] / src / map / Area.cpp

diff --git a/src/map/Area.cpp b/src/map/Area.cpp
index 6b3f9b186373714aa384748e7a3ba10eb8f19b22..1b9488a01120d045e2eddbeb0df94e402c0797a8 100644 (file)
--- a/src/map/Area.cpp
+++ b/src/map/Area.cpp
@@ -9,28 +9,41 @@
 
 #include "Tile.h"
 #include "../graphics/Sprite.h"
+#include "../loader/TypeDescription.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>
 
 using geometry::Vector;
+using loader::FieldDescription;
+using loader::TypeDescription;
 
 namespace map {
 
 Area::Area()
-: tiles(0)
+: battlebg(0)
+, tiles(0)
 , numTiles(0)
 , width(0) {
 
 }
 
 
-const Tile &Area::TileAt(const geometry::Vector<int> &offset) const {
+Tile *Area::TileAt(const geometry::Vector<int> &offset) {
        int tileIndex(offset.Y() * width + offset.X());
        if (tileIndex < numTiles) {
-               return tiles[tileIndex];
+               return tiles +tileIndex;
        } else {
-               throw std::out_of_range("tile index out of range");
+               return 0;
+       }
+}
+
+const Tile *Area::TileAt(const geometry::Vector<int> &offset) const {
+       int tileIndex(offset.Y() * width + offset.X());
+       if (tileIndex < numTiles) {
+               return tiles +tileIndex;
+       } else {
+               return 0;
        }
 }
 
@@ -76,4 +89,25 @@ void Area::RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const
        }
 }
 
+
+void Area::CreateTypeDescription() {
+       Area a;
+
+       int imageId(TypeDescription::GetTypeId("Image"));
+       int numberId(TypeDescription::GetTypeId("Number"));
+       int tileId(TypeDescription::GetTypeId("Tile"));
+
+       TypeDescription &td(TypeDescription::CreateOrGet("Area"));
+       td.SetConstructor(&Construct);
+       td.SetSize(sizeof(Area));
+
+       td.AddField("battlebg", FieldDescription(((char *)&a.battlebg) - ((char *)&a), imageId).SetReferenced());
+       td.AddField("tiles", FieldDescription(((char *)&a.tiles) - ((char *)&a), tileId).SetReferenced().SetAggregate());
+       td.AddField("width", FieldDescription(((char *)&a.width) - ((char *)&a), numberId));
+}
+
+void Area::Construct(void *data) {
+       new (data) Area;
+}
+
 }