From f40ea80142cc4525f101e23aec3994054aa8991a Mon Sep 17 00:00:00 2001 From: toksikk Date: Fri, 31 Oct 2014 11:05:54 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=C3=A4nderung=20der=20pfade=20zu=20den=20bi?= =?UTF-8?q?lddateien?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/objects/Objekt.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/HeatUp/src/de/heatup/objects/Objekt.java b/HeatUp/src/de/heatup/objects/Objekt.java index becc345..44b79dc 100644 --- a/HeatUp/src/de/heatup/objects/Objekt.java +++ b/HeatUp/src/de/heatup/objects/Objekt.java @@ -41,15 +41,15 @@ public class Objekt { switch (objectIdentifier) { case '1': //leiterbahn - objectFilename="images/25x25_black.png"; + objectFilename="../resources/images/25x25_black.png"; break; case '2': //2:harware - objectFilename="images/25x25_red.png"; + objectFilename="../resources/images/25x25_red.png"; break; case '3': //3:wand - objectFilename="images/25x25_blue.png"; + objectFilename="../resources/images/25x25_blue.png"; break; default: objectFilename="images/25x25_orange.png"; From 824ea91186b4045cfa3019c1f48d2706039082f0 Mon Sep 17 00:00:00 2001 From: toksikk Date: Fri, 31 Oct 2014 11:12:48 +0100 Subject: [PATCH 2/2] =?UTF-8?q?.classpath=20zu=20ignore=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MapEngine Update --- .gitignore | 1 + HeatUp/.classpath | 2 +- HeatUp/src/de/heatup/mapengine/MapEngine.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 319f24c..cb2f5cd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ tmp/ local.properties .settings/ .loadpath +.classpath diff --git a/HeatUp/.classpath b/HeatUp/.classpath index d4c97fc..fb50116 100644 --- a/HeatUp/.classpath +++ b/HeatUp/.classpath @@ -1,6 +1,6 @@ - + diff --git a/HeatUp/src/de/heatup/mapengine/MapEngine.java b/HeatUp/src/de/heatup/mapengine/MapEngine.java index 60a48f6..2ff0448 100644 --- a/HeatUp/src/de/heatup/mapengine/MapEngine.java +++ b/HeatUp/src/de/heatup/mapengine/MapEngine.java @@ -1,4 +1,4 @@ -package mapEngine; + import java.awt.Color; import java.io.File; @@ -12,7 +12,7 @@ import java.util.Stack; import javax.swing.JPanel; -import mapEngine2.Objekt; +import de.heatup.objects.*; public class MapEngine { int[][] tiles;