Permalink
Browse files

Merge branch 'master' of git@github.com:propra12-orga/gruppe15.git

  • Loading branch information...
2 parents 3cb825a + a3ef54f commit 435e4a83a91bf14c1fdd3a2021416f6e26091c61 @M4urice M4urice committed Jul 2, 2012
Showing with 5 additions and 3 deletions.
  1. +0 −2 .gitignore
  2. +4 −1 src/entities/BreakableWall.java
  3. +1 −0 src/entities/WallWithFinishingPoint.java
View
@@ -1,5 +1,3 @@
/src/ressources/scores.dat
-/src/ressources/maps/FileWriterTest.txt
-/src/ressources/maps/genMap
/bin
/doc
@@ -4,6 +4,7 @@
import entities.items.Falle;
import entities.items.Item;
+import entities.items.Schuh;
import game.Game;
import graphics.Sprite;
@@ -12,7 +13,7 @@
*/
public class BreakableWall extends Wall {
- private Item item;
+ protected Item item = null;
/**
* @param x
@@ -35,6 +36,8 @@ public BreakableWall(int x, int y) {
if (new Random().nextInt(10) > 8) {
this.item = new Falle(x, y);
+ } else if (new Random().nextInt(10) > 8) {
+ this.item = new Schuh(x, y);
}
}
@@ -14,6 +14,7 @@
*/
public WallWithFinishingPoint(int x, int y) {
super(x, y);
+ this.item = null;
}
/*

0 comments on commit 435e4a8

Please sign in to comment.