extracted tile coordinates calculation

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 7712a024838ca5a7e1719300db70af327bc8164e..10b74d079a01d43b422fa7719bb1a84298aa8d8d 100644 (file)
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -30,8 +30,8 @@ Map::Map()
 
 const Area &Map::AreaAt(const Vector<int> &offset) const {
        if (numAreas > 0) {
 
 const Area &Map::AreaAt(const Vector<int> &offset) const {
        if (numAreas > 0) {

-               Vector<int> tileOffset(offset.X() / tileset->Width(), offset.Y() / tileset->Height());
-               Vector<int> areaOffset(tileOffset.X() / areas[0].Width(), tileOffset.Y() / areas[0].Height());
+               Vector<int> coords(TileCoordinates(offset));
+               Vector<int> areaOffset(coords.X() / areas[0].Width(), coords.Y() / areas[0].Height());

                int areaIndex(areaOffset.Y() * width + areaOffset.X());
                if (areaIndex < numAreas) {
                        return areas[areaIndex];
                int areaIndex(areaOffset.Y() * width + areaOffset.X());
                if (areaIndex < numAreas) {
                        return areas[areaIndex];


@@ -48,15 +48,19 @@ const Tile &Map::TileAt(const Vector<int> &offset) const {
 
 Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
        // TODO: add support for multiple triggers on a tile?
 
 Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
        // TODO: add support for multiple triggers on a tile?

-       Vector<int> tilePosition(offset.X() / tileset->Width(), offset.Y() / tileset->Height());
+       Vector<int> coords(TileCoordinates(offset));

        for (Trigger *i(triggers); i != triggers + numTriggers; ++i) {
        for (Trigger *i(triggers); i != triggers + numTriggers; ++i) {

-               if (i->TilePosition() == tilePosition) {
+               if (i->TilePosition() == coords) {

                        return i;
                }
        }
        return 0;
 }
 
                        return i;
                }
        }
        return 0;
 }
 

+Vector<int> Map::TileCoordinates(const Vector<int> &position) const {
+       return Vector<int>(position.X() / tileset->Width(), position.Y() / tileset->Height());
+}
+

 
 void Map::Render(SDL_Surface *dest, const Vector<int> &inOffset) const {
        // TODO: skip invisible areas
 
 void Map::Render(SDL_Surface *dest, const Vector<int> &inOffset) const {
        // TODO: skip invisible areas

diff --git a/src/map/Map.h b/src/map/Map.h
index dd0185cdeacca199f5018f17826f4a429b7c2e86..bda62bdd83c5485fa5e1aedddd00a98745d33272 100644 (file)
--- a/src/map/Map.h
+++ b/src/map/Map.h
@@ -27,6 +27,7 @@ public:
        const Area &AreaAt(const geometry::Vector<int> &) const;
        const Tile &TileAt(const geometry::Vector<int> &) const;
        Trigger *TriggerAt(const geometry::Vector<int> &);
        const Area &AreaAt(const geometry::Vector<int> &) const;
        const Tile &TileAt(const geometry::Vector<int> &) const;
        Trigger *TriggerAt(const geometry::Vector<int> &);

+       geometry::Vector<int> TileCoordinates(const geometry::Vector<int> &) const;

 
        void Render(SDL_Surface *dest, const geometry::Vector<int> &offset) const;
 
 
        void Render(SDL_Surface *dest, const geometry::Vector<int> &offset) const;