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

Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into develop

Browse Source 
Conflicts:
	image/Images.java
This commit is contained in:
Bilel Bghiel
2015-06-19 19:46:35 +02:00
parent b86ce91755 2ba069c0e2
commit 42228aa9f7
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image/Images.java
+3 -2
View File
@@ -32,7 +32,7 @@ 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"))));
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/help.png"))));
} catch (IOException e) {
e.printStackTrace();
}
@@ -100,7 +100,8 @@ public class Images {
public static VolatileImage initVolatileImage(int width, int height, int opc){
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsConfiguration gc = ge.getDefaultScreenDevice().getDefaultConfiguration();
VolatileImage image = gc.createCompatibleVolatileImage(width, height, opc);
VolatileImage image = null;
image = gc.createCompatibleVolatileImage(width, height, opc);
int valid = image.validate(gc);
if (valid == VolatileImage.IMAGE_INCOMPATIBLE)
image = initVolatileImage(width, height, opc);