da/HeatUp
1
0
Fork 0
mirror of https://github.com/jokerx3/HeatUp synced 2026-07-27 14:19:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:jokerx3/prp

Browse Source 
Conflicts:
	HeatUp/.classpath
This commit is contained in:
andreas
2014-10-31 12:00:25 +01:00
parent edcc7606ba 824ea91186
commit ee6995565e
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/.classpath
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
HeatUp/src/de/heatup/mapengine/MapEngine.java
+2 -2
View File
@@ -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;
HeatUp/src/de/heatup/objects/Objekt.java
+3 -3
View File
@@ -45,15 +45,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";