From b27f427bbb6a1a1ee1230bacb4fce0eb3a8af240 Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Fri, 5 Oct 2012 15:11:59 +0200
Subject: [PATCH] extracted tile coordinates calculation

---
 src/map/Map.cpp | 12 ++++++++----
 src/map/Map.h   |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 7712a02..10b74d0 100644
--- 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) {
-		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];
@@ -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?
-	Vector<int> tilePosition(offset.X() / tileset->Width(), offset.Y() / tileset->Height());
+	Vector<int> coords(TileCoordinates(offset));
 	for (Trigger *i(triggers); i != triggers + numTriggers; ++i) {
-		if (i->TilePosition() == tilePosition) {
+		if (i->TilePosition() == coords) {
 			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
diff --git a/src/map/Map.h b/src/map/Map.h
index dd0185c..bda62bd 100644
--- 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> &);
+	geometry::Vector<int> TileCoordinates(const geometry::Vector<int> &) const;
 
 	void Render(SDL_Surface *dest, const geometry::Vector<int> &offset) const;
 
-- 
2.39.2