X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FArea.cpp;h=6299290a6a98057dfcbb3257675fcd07bdb37324;hb=HEAD;hp=a2554c31b2bd01b833171909556d4ee7dd6f3441;hpb=242bdb40a032306ad2bf57487e7f23a0c308fe44;p=l2e.git diff --git a/src/map/Area.cpp b/src/map/Area.cpp index a2554c3..6299290 100644 --- a/src/map/Area.cpp +++ b/src/map/Area.cpp @@ -44,13 +44,19 @@ const Tile *Area::TileAt(const math::Vector &offset) const { } -void Area::Render(SDL_Surface *dest, const graphics::Sprite *tileset, const Vector &inOffset) const { +void Area::Render( + SDL_Surface *dest, + const graphics::Sprite *tileset, + const Vector &inOffset, + unsigned int frame) const { for (int i(0); i < numTiles; ++i) { Vector 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())); } } @@ -102,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)); }