From 8f063da8b35051329bc9850c703a67d2df58384b Mon Sep 17 00:00:00 2001
From: andreas <andreas.hainke@foteviken.de>
Date: Fri, 31 Oct 2014 13:11:44 +0100
Subject: [PATCH] Anpassungen an Objekt

---
 HeatUp/src/de/heatup/objects/Gegner.java   |  8 ++++----
 HeatUp/src/de/heatup/objects/Objekt.java   | 22 ++++++++++++++--------
 HeatUp/src/de/heatup/ui/GameInterface.java | 12 ++++++------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/HeatUp/src/de/heatup/objects/Gegner.java b/HeatUp/src/de/heatup/objects/Gegner.java
index 58f8d9b..e38e07e 100644
--- a/HeatUp/src/de/heatup/objects/Gegner.java
+++ b/HeatUp/src/de/heatup/objects/Gegner.java
@@ -18,13 +18,13 @@ public class Gegner {
 		numberOfInstances++;
 		String fname;
 		if (numberOfInstances == 1 ) {
-			fname="images/red48.png";
+			fname="../resources/images/25x25_black.png";
 		} else if (numberOfInstances == 2) {
-			fname="images/green48.png";			
+			fname="../resources/images/25x25_black.png";			
 		} else {
-			fname="images/black48.png";
+			fname="../resources/images/25x25_black.png";
 		}
-		opponentImage = ImageIO.read(new File(fname));
+		opponentImage = ImageIO.read(new File("./resources/images/25x25_black.png"));
 		opponentLabel = new JLabel(new ImageIcon(opponentImage));
 		this.gegnerLogik();
 	}
diff --git a/HeatUp/src/de/heatup/objects/Objekt.java b/HeatUp/src/de/heatup/objects/Objekt.java
index 5e7207c..2afe2bd 100644
--- a/HeatUp/src/de/heatup/objects/Objekt.java
+++ b/HeatUp/src/de/heatup/objects/Objekt.java
@@ -18,14 +18,15 @@ public class Objekt {
 	private Point objectArea;
 	private Point actionArea;
 	public Thread t;
-	private int objectType;
 	private char objectIdentifier; // TODO: Identifizierung für Map Engine
 
 	/*
 	 * TODO: Use Graphics instead of JLabel
-	 * 	
 	 */
 	
+	/*
+	 * This constructor is deprecated
+	 */
 	public Objekt(String filename) throws IOException {
 		numberOfInstances++;
 		objectImage = ImageIO.read(new File(filename));
@@ -34,6 +35,12 @@ public class Objekt {
 
 	public Objekt(char objectIdentifier) throws IOException {
 		numberOfInstances++;
+		setObjectIdentifier(objectIdentifier);
+		setObjectImage();
+		
+	}
+	
+	private void setObjectImage() throws IOException {
 		String filename = getImageFilename(objectIdentifier);
 		System.out.println(filename);
 		objectImage = ImageIO.read(new File(filename));
@@ -91,12 +98,11 @@ public class Objekt {
 		return this.objectLabel;
 	}
 	
-	public void setObjectType(int objectType) {
-		this.objectType = objectType;
+	public char getOjectIdentifier() {
+		return this.objectIdentifier;
 	}
-	
-	public int getObjectType() {
-		return this.objectType;
+		
+	public void setObjectIdentifier(char objectIdentifier) {
+		this.objectIdentifier = objectIdentifier;
 	}
-	
 }
diff --git a/HeatUp/src/de/heatup/ui/GameInterface.java b/HeatUp/src/de/heatup/ui/GameInterface.java
index ad598a3..4700e95 100644
--- a/HeatUp/src/de/heatup/ui/GameInterface.java
+++ b/HeatUp/src/de/heatup/ui/GameInterface.java
@@ -94,12 +94,12 @@ public class GameInterface extends JFrame {
 		o1.getLabel().setVisible(true);
 
 		
-		Objekt s1 = new Objekt('0');
-		Objekt s2 = new Objekt('0');
-		Objekt s3 = new Objekt('0');
-		Objekt s4 = new Objekt('0');
-		Objekt s5 = new Objekt('0');
-		Objekt s6 = new Objekt('0');
+		Objekt s1 = new Objekt("../resources/images/25x25_black.png");
+		Objekt s2 = new Objekt("../resources/images/25x25_black.png");
+		Objekt s3 = new Objekt("../resources/images/25x25_black.png");
+		Objekt s4 = new Objekt("../resources/images/25x25_black.png");
+		Objekt s5 = new Objekt("../resources/images/25x25_black.png");
+		Objekt s6 = new Objekt("../resources/images/25x25_black.png");
 
 		
 		/*