X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.h;h=6b2eea4030e9f642d2bf855e0c449970124371e3;hb=abfa371d1d2c14052d4cbfc885b8383c6da7d499;hp=101689f72c43f9ecece1748100f90b9aa4bfc5ed;hpb=092a2dd175a4001a495c84ee85211734fb928c83;p=l2e.git diff --git a/src/map/Map.h b/src/map/Map.h index 101689f..6b2eea4 100644 --- a/src/map/Map.h +++ b/src/map/Map.h @@ -21,8 +21,8 @@ namespace map { /// Maps are made up of uniform areas of tiles. /// The looks of a tile is defined by the Tileset() sprite with Tile::Offset() /// as the column and row in the sprite. -/// Maps can be propulated with triggers and entities. Those are or use with -/// MapState and are not handled by the map itself. +/// Maps can be propulated with triggers and entities. Those are for use with +/// a MapState and are not handled by the map itself. /// Positions are expressed either as pixel or tile coordinates depending on /// function purpose with (0|0) being the top left corner and positive values /// extending to the right and down respectively. @@ -50,15 +50,20 @@ public: /// The battle background image for this map if neither the tile nor the /// area has one specified. SDL_Surface *BattleBackgroundAt(const math::Vector &); - /// Convert coordinates pixel to tile. + /// Convert coordinates from pixel to tile. math::Vector TileCoordinates(const math::Vector &) const; + /// Convert coordinates from tile to pixel. + math::Vector PixelCoordinates(const math::Vector &) const; Entity *EntitiesBegin() { return entities; } Entity *EntitiesEnd() { return entities + numEntities; } /// Render the map. /// Entities are not rendered by this function. - void Render(SDL_Surface *dest, const math::Vector &offset) const; + void Render( + SDL_Surface *dest, + const math::Vector &offset, + unsigned int frame) const; /// Render a debugging overlay that includes collision and trigger /// information. void RenderDebug(SDL_Surface *dest, const math::Vector &offset) const; @@ -81,4 +86,4 @@ private: } -#endif /* MAP_MAP_H_ */ +#endif