diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java index 9b5f8e09d4e82f77fb71ff7895d864dd9276398a..c202d042071b0a9e5c3dca9b85edd2a338c55005 100644 --- a/src/main/java/controller/Controller.java +++ b/src/main/java/controller/Controller.java @@ -91,6 +91,9 @@ public class Controller { if (squareState.contains(ModelElement.CLOUD)){ return ViewElement.CLOUD; } + if(squareState.contains(ModelElement.MOUNTAIN)){ + return ViewElement.MOUNTAIN; + } return ViewElement.EMPTY; } @@ -127,9 +130,9 @@ public class Controller { } public void initialize(int squareWidth, int squareHeight, int columnCount, - int rowCount, int initialFireCount, int initialFirefighterCount) { + int rowCount, int initialFireCount, int initialFirefighterCount, int initialCloudCount, int initialMountainCount) { grid.setDimensions(columnCount, rowCount, squareWidth, squareHeight); - this.setModel(new FirefighterBoard(columnCount, rowCount, initialFireCount, initialFirefighterCount, initialFireCount)); + this.setModel(new FirefighterBoard(columnCount, rowCount, initialFireCount, initialFirefighterCount, initialCloudCount, initialMountainCount)); repaintGrid(); }