Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pre-playState' into develop

Browse Source 
Conflicts:
	control/GameControl.java
	control/GameStateManager.java
	image/Images.java
This commit is contained in:
kennyboy55
2015-06-22 09:13:25 +02:00
parent 93e4cb3d6e 665f04ceef
commit 9f2f84c608
6 changed files with 107 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image/Images.java
+3 -4
View File
@@ -32,7 +32,8 @@ public class Images {
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/aanwijzers4sho.png"))));
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/kast.png"))));
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/gameover.png"))));
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/gameover.png")))); // HELP, MAAR NOG GEEN JUIST PLAATJE
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/help.png")))); // HELP, MAAR NOG GEEN JUIST PLAATJE
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/screenshot.png"))));
} catch (IOException e) {
e.printStackTrace();
}
@@ -43,9 +44,7 @@ public class Images {
}
public enum ImageType {
pulse, cursor, pressstart,
colorstrike, background, aanwijzers,
kast, gameover, help
pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast,gameover,help, screenshot
}
public static BufferedImage readImage(File f) {