Permalink
Browse files

Merge branch 'master' of github.com:Project42/ZandzakGame

Conflicts:
	project.greenfoot
  • Loading branch information...
2 parents 7ffbe83 + 029f9ac commit abc7a65533dba01d2d0becbfc5e3fa1eabc1fb02 @aardvarrk aardvarrk committed Jan 24, 2013
Showing with 492 additions and 490 deletions.
  1. +2 −4 Bag.java
  2. +5 −0 Water.java
  3. +485 −486 project.greenfoot
View
@@ -1,7 +1,7 @@
import greenfoot.*;
import java.util.List;
-public class Bag extends Actor {
+public abstract class Bag extends Actor {
private int weight;
private int lifetime;
@@ -38,9 +38,7 @@ public void act() {
}
}
- public int getCost() {
- return 0;
- }
+ public abstract int getCost();
public int getWeight() {
return weight;
View
@@ -31,6 +31,11 @@ public void act() {
Actor meadow = getOneObjectAtOffset(0, 0, Meadow.class);
if (meadow == null) return;
+<<<<<<< HEAD
+ Greenfoot.stop();
+ JOptionPane.showMessageDialog(null, "De dijk is doorgebroken!");
+=======
((FloodWorld)getWorld()).gameOver();
+>>>>>>> 0f2f759dd33c5f4573b995874f6aa41ff4b4b930
}
}
Oops, something went wrong.

0 comments on commit abc7a65

Please sign in to comment.