From 5ac6e861c1694b9d4bf258830c4e4fb44cadea62 Mon Sep 17 00:00:00 2001
From: toksikk <sykikk+github@gmail.com>
Date: Sat, 1 Nov 2014 22:30:04 +0100
Subject: [PATCH] =?UTF-8?q?MapEngine:=20"Magic=20Number"=20hinzugef=C3=BCg?=
 =?UTF-8?q?t=20MapObjectHandler:=20Bugfix.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HeatUp/src/de/heatup/mapengine/MapEngine.java | 10 ++++--
 .../de/heatup/mapengine/MapObjectHandler.java | 31 +++++++++++++------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/HeatUp/src/de/heatup/mapengine/MapEngine.java b/HeatUp/src/de/heatup/mapengine/MapEngine.java
index 34331b9..ba58d13 100644
--- a/HeatUp/src/de/heatup/mapengine/MapEngine.java
+++ b/HeatUp/src/de/heatup/mapengine/MapEngine.java
@@ -14,6 +14,10 @@ import de.heatup.logging.Logger;
 import de.heatup.objects.*;
 
 public class MapEngine {
+	/*
+	 * MAGIC NUMBER SINGLE TILE WIDTH
+	 */
+	private static final int singleTileWidth = 25;
 	final int mapHeight = 24;
 	final int mapWidth = 32;
 	HashMap<Character, ArrayList<Point>> allMapTiles = new HashMap<Character, ArrayList<Point>>();
@@ -78,11 +82,11 @@ public class MapEngine {
 				/*
 				 * setze x und y auf die koordinaten für das objekt im NÄCHSTEN durchlauf
 				 */
-				if (x+25 >= 800) {
+				if (x+singleTileWidth >= 800) {
 					x = 0;
-					y += 25;
+					y += singleTileWidth;
 				} else {
-					x += 25;
+					x += singleTileWidth;
 				}
 			}
 			lineCount++;
diff --git a/HeatUp/src/de/heatup/mapengine/MapObjectHandler.java b/HeatUp/src/de/heatup/mapengine/MapObjectHandler.java
index 3d6cfe7..69ce574 100644
--- a/HeatUp/src/de/heatup/mapengine/MapObjectHandler.java
+++ b/HeatUp/src/de/heatup/mapengine/MapObjectHandler.java
@@ -36,17 +36,28 @@ public class MapObjectHandler {
 			MapObjectHandler.allMapObjects.add(newStaticObject);
 		}
 	}
+	/*
+	 * die ganze methode ist unglaublich schlechter und hässlicher programmierstil, aber das weiß ich und ändere ich noch.
+	 * 
+	 * 		mfg daniel. :)
+	 */
 	protected static void addAllWallsAndWaysTiles(MapEngine me) {
-		for (int i = 0; i<me.getAvailableHardwareTileTypes().size(); i++) {
-			char currentType = me.getAvailableHardwareTileTypes().get(i);
-			if (currentType == '#' || currentType == '-') {
-				ArrayList<Point> allPointsOfCurrentType = me.getAllCoordinatesOfTileType(currentType);
-				for (int j = 0; j<allPointsOfCurrentType.size(); j++) {
-					Point currentPoint = allPointsOfCurrentType.get(j);
-					StaticObject newStaticObject = new StaticObject(currentType, currentPoint);
-					MapObjectHandler.allMapObjects.add(newStaticObject);
-				}
-			}
+		ArrayList<Point> allCoordinatesOfWayTileType = me.getAllCoordinatesOfTileType('#');
+		ArrayList<Point> allCoordinatesOfWallTileType = me.getAllCoordinatesOfTileType('-');
+		
+		for (int i = 0; i < allCoordinatesOfWayTileType.size(); i++) {
+			Point currentPoint = allCoordinatesOfWayTileType.get(i);
+			StaticObject newStaticObject = new StaticObject('#', currentPoint);
+			MapObjectHandler.allMapObjects.add(newStaticObject);
 		}
+		for (int i = 0; i < allCoordinatesOfWallTileType.size(); i++) {
+			Point currentPoint = allCoordinatesOfWallTileType.get(i);
+			StaticObject newStaticObject = new StaticObject('-', currentPoint);
+			MapObjectHandler.allMapObjects.add(newStaticObject);
+		}
+			
+		
+		
+		
 	}
 }