added debug render for ladder flag

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

diff --git a/src/map/Area.cpp b/src/map/Area.cpp
index 6b3f9b186373714aa384748e7a3ba10eb8f19b22..a2554c31b2bd01b833171909556d4ee7dd6f3441 100644 (file)
--- a/src/map/Area.cpp
+++ b/src/map/Area.cpp
@@ -1,36 +1,45 @@
-/*
- * Area.cpp
- *
- *  Created on: Sep 26, 2012
- *      Author: holy
- */
-
 #include "Area.h"
 
 #include "Tile.h"
 #include "../graphics/Sprite.h"
+#include "../loader/TypeDescription.h"
+#include "../loader/Interpreter.h"
+#include "../math/Vector.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>
 
-using geometry::Vector;
+using math::Vector;
+using loader::FieldDescription;
+using loader::Interpreter;
+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 math::Vector<int> &offset) {
+       int tileIndex(offset.Y() * width + offset.X());
+       if (tileIndex < numTiles) {
+               return tiles +tileIndex;
+       } else {
+               return 0;
+       }
+}
+
+const Tile *Area::TileAt(const math::Vector<int> &offset) const {
        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;
        }
 }
 
@@ -73,7 +82,32 @@ void Area::RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const
                if (tile.BlocksWest()) {
                        sdl::VerticalLine(dest, offset, tileset->Height(), color);
                }
+               if (tile.IsLadder()) {
+                       SDL_Rect rect;
+                       rect.x = offset.X() + (tileset->Width() / 2) - 2;
+                       rect.y = offset.Y();
+                       rect.w = 4;
+                       rect.h = tileset->Height();
+                       SDL_FillRect(dest, &rect, color);
+               }
        }
 }
 
+
+void Area::CreateTypeDescription() {
+       Area a;
+
+       TypeDescription &td(TypeDescription::Create(TYPE_ID, "Area"));
+       td.SetConstructor(&Construct);
+       td.SetSize(sizeof(Area));
+
+       td.AddField("battlebg", FieldDescription(((char *)&a.battlebg) - ((char *)&a), Interpreter::IMAGE_ID).SetReferenced());
+       td.AddField("tiles", FieldDescription(((char *)&a.tiles) - ((char *)&a), Tile::TYPE_ID).SetReferenced().SetAggregate());
+       td.AddField("width", FieldDescription(((char *)&a.width) - ((char *)&a), Interpreter::NUMBER_ID));
+}
+
+void Area::Construct(void *data) {
+       new (data) Area;
+}
+
 }