X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FArea.cpp;h=6299290a6a98057dfcbb3257675fcd07bdb37324;hb=HEAD;hp=e7d6f6635d8b284f7945bc2c5c2729238ccefbef;hpb=092a2dd175a4001a495c84ee85211734fb928c83;p=l2e.git

diff --git a/src/map/Area.cpp b/src/map/Area.cpp
index e7d6f66..6299290 100644
--- a/src/map/Area.cpp
+++ b/src/map/Area.cpp
@@ -44,13 +44,19 @@ const Tile *Area::TileAt(const math::Vector<int> &offset) const {
 }
 
 
-void Area::Render(SDL_Surface *dest, const graphics::Sprite *tileset, const Vector<int> &inOffset) const {
+void Area::Render(
+		SDL_Surface *dest,
+		const graphics::Sprite *tileset,
+		const Vector<int> &inOffset,
+		unsigned int frame) const {
 	for (int i(0); i < numTiles; ++i) {
 		Vector<int> offset(
 				inOffset.X() + (i % width) * tileset->Width(),
 				inOffset.Y() + (i / width) * tileset->Height());
 		const Tile &tile(tiles[i]);
-		tileset->Draw(dest, offset, tile.Offset().X(), tile.Offset().Y());
+		tileset->Draw(dest, offset,
+				tile.Offset().X(),
+				tile.Offset().Y() + (frame % tile.NumFrames()));
 	}
 }
 
@@ -82,6 +88,14 @@ 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);
+		}
 	}
 }
 
@@ -94,7 +108,7 @@ void Area::CreateTypeDescription() {
 	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("tiles", FieldDescription(((char *)&a.tiles) - ((char *)&a), Tile::TYPE_ID).SetAggregate());
 	td.AddField("width", FieldDescription(((char *)&a.width) - ((char *)&a), Interpreter::NUMBER_ID));
 }