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

Anpassungen an Objekt

Browse Source
This commit is contained in:
andreas
2014-10-31 13:11:44 +01:00
parent 37d74adac8
commit 8f063da8b3
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/objects/Gegner.java
+4 -4
View File
@@ -18,13 +18,13 @@ public class Gegner {
numberOfInstances++; numberOfInstances++;
String fname; String fname;
if (numberOfInstances == 1 ) { if (numberOfInstances == 1 ) {
fname="images/red48.png"; fname="../resources/images/25x25_black.png";
} else if (numberOfInstances == 2) { } else if (numberOfInstances == 2) {
fname="images/green48.png"; fname="../resources/images/25x25_black.png";
} else { } 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)); opponentLabel = new JLabel(new ImageIcon(opponentImage));
this.gegnerLogik(); this.gegnerLogik();
} }
HeatUp/src/de/heatup/objects/Objekt.java
+13 -7
View File
@@ -18,14 +18,15 @@ public class Objekt {
private Point objectArea; private Point objectArea;
private Point actionArea; private Point actionArea;
public Thread t; public Thread t;
private int objectType;
private char objectIdentifier; // TODO: Identifizierung für Map Engine private char objectIdentifier; // TODO: Identifizierung für Map Engine
/* /*
* TODO: Use Graphics instead of JLabel * TODO: Use Graphics instead of JLabel
*
*/ */
/*
* This constructor is deprecated
*/
public 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));
@@ -34,6 +35,12 @@ public class Objekt {
public Objekt(char objectIdentifier) throws IOException { public Objekt(char objectIdentifier) throws IOException {
numberOfInstances++; numberOfInstances++;
setObjectIdentifier(objectIdentifier);
setObjectImage();
}
private void setObjectImage() throws IOException {
String filename = getImageFilename(objectIdentifier); String filename = getImageFilename(objectIdentifier);
System.out.println(filename); System.out.println(filename);
objectImage = ImageIO.read(new File(filename)); objectImage = ImageIO.read(new File(filename));
@@ -91,12 +98,11 @@ public class Objekt {
return this.objectLabel; return this.objectLabel;
} }
public void setObjectType(int objectType) { public char getOjectIdentifier() {
this.objectType = objectType; return this.objectIdentifier;
} }
public int getObjectType() { public void setObjectIdentifier(char objectIdentifier) {
return this.objectType; this.objectIdentifier = objectIdentifier;
} }
} }
HeatUp/src/de/heatup/ui/GameInterface.java
+6 -6
View File
@@ -94,12 +94,12 @@ public class GameInterface extends JFrame {
o1.getLabel().setVisible(true); o1.getLabel().setVisible(true);
Objekt s1 = new Objekt('0'); Objekt s1 = new Objekt("../resources/images/25x25_black.png");
Objekt s2 = new Objekt('0'); Objekt s2 = new Objekt("../resources/images/25x25_black.png");
Objekt s3 = new Objekt('0'); Objekt s3 = new Objekt("../resources/images/25x25_black.png");
Objekt s4 = new Objekt('0'); Objekt s4 = new Objekt("../resources/images/25x25_black.png");
Objekt s5 = new Objekt('0'); Objekt s5 = new Objekt("../resources/images/25x25_black.png");
Objekt s6 = new Objekt('0'); Objekt s6 = new Objekt("../resources/images/25x25_black.png");
/* /*