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

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

Browse Source
This commit is contained in:
toksikk
2014-10-31 12:06:16 +01:00
parent 0916196c92 4ca2186910
commit 139761c716
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/objects/Objekt.java
+6 -2
View File
@@ -6,6 +6,10 @@ import java.io.IOException;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.Arrays; import java.util.Arrays;
import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
public class Objekt { public class Objekt {
private static int numberOfInstances; private static int numberOfInstances;
@@ -22,13 +26,13 @@ public class Objekt {
* *
*/ */
Objekt(String filename) throws IOException { public Objekt(String filename) throws IOException {
numberOfInstances++; numberOfInstances++;
objectImage = ImageIO.read(new File(filename)); objectImage = ImageIO.read(new File(filename));
objectLabel = new JLabel(new ImageIcon(objectImage)); objectLabel = new JLabel(new ImageIcon(objectImage));
} }
Objekt(char objectIdentifier) throws IOException { public Objekt(char objectIdentifier) throws IOException {
numberOfInstances++; numberOfInstances++;
String filename = getImageFilename(objectIdentifier); String filename = getImageFilename(objectIdentifier);
System.out.println(filename); System.out.println(filename);
HeatUp/src/de/heatup/ui/GameInterface.java
+3
View File
@@ -11,6 +11,9 @@ import javax.swing.BorderFactory;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JPanel; import javax.swing.JPanel;
import de.heatup.objects.Gegner;
import de.heatup.objects.Objekt;