Merge branch 'master' into game

2016-05-07 14:18:43 +02:00
parent e98abbecac 9e93cf8928
commit bf191678a6
9 changed files with 125 additions and 5 deletions
--- a/cicaprojekt/Game.java
+++ b/cicaprojekt/Game.java
@ -21,8 +21,8 @@ public class Game {
        flowoftime = new FlowOfTime();
    }

-    public void allZPMsCollected() {
-        this.stopGame();
+    public void allZPMsCollected(GameoverCause cause) {
+        this.stopGame(cause);
    }

    public void startGame(File dungeonFile) throws IOException {
@ -40,6 +40,6 @@ public class Game {
        return Direction.values()[random.nextInt(Direction.values().length)];
    }

-    public void stopGame() {
+    public void stopGame(GameoverCause cause) {
    }
 }