Fix for #182

se2p-se · Jun 18, 2021 · 250aee8 · 250aee8
1 parent c085da2
commit 250aee8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/main/java/de/uni_passau/fim/se/memory/controller/InputStreamMainMenue.java b/src/main/java/de/uni_passau/fim/se/memory/controller/InputStreamMainMenue.java
@@ -3,7 +3,6 @@
 import de.uni_passau.fim.se.memory.model.MainMenue;
 import de.uni_passau.fim.se.memory.view.OutputStream;
 import de.uni_passau.fim.se.memory.view.OutputStreamMainMenue;
-import de.uni_passau.fim.se.memory.view.OutputStream;
 
 import java.util.Scanner;
 
@@ -14,6 +13,8 @@ public class InputStreamMainMenue {
     MainMenue mainMenue = new MainMenue() ;
     InputStreamPlayer player = new InputStreamPlayer() ;
 
+    int[] gameBoardSize = new int[]{5, 4};
+
     /**
      * user can pick an option
      */
@@ -29,7 +30,10 @@ public void pickMainMenueOption () {
                     } else {
                         player = new InputStreamPlayer();
                     }
-
+
+                    player.game.setGameBoardSize(gameBoardSize[0],
+                            gameBoardSize[1]);
+
                     if (MainMenue.getActivateHelp()) {
                         OutputStream.printOpenBoard(player.game);
                         player.game.timer(5000);
@@ -60,13 +64,13 @@ public void pickMainMenueOption () {
                         int difficulty = setGameBoardSize.nextInt();
 
                         if (difficulty == 1) {
-                            player.game.setGameBoardSize(3, 4);
+                            gameBoardSize = new int[]{3, 4};
                             break;
                         } else if (difficulty == 2) {
-                            player.game.setGameBoardSize(4, 4);
+                            gameBoardSize = new int[]{4, 4};
                             break;
                         } else if (difficulty == 3) {
-                            player.game.setGameBoardSize(5, 4);
+                            gameBoardSize = new int[]{5, 4};
                             break;
                         } else if (difficulty == 4) {
                             OutputStreamMainMenue.showPleaseInsertGameBoardSizeX();
@@ -80,7 +84,7 @@ public void pickMainMenueOption () {
                                 OutputStreamMainMenue.showPleaseInsertGameBoardSizeY();
                                 y = setGameBoardSize.nextInt();
                             }
-                            player.game.setGameBoardSize(x, y);
+                            gameBoardSize = new int[]{x, y};
                             break;
                         }
                     }

diff --git a/src/main/java/de/uni_passau/fim/se/memory/model/Game.java b/src/main/java/de/uni_passau/fim/se/memory/model/Game.java
@@ -12,6 +12,9 @@ public class Game {
 
 	public void setGameBoardSize(int x, int y) {
 		this.gameBoardSize = new int[]{x,y};
+		cards.clear();
+		generateCards();
+		mixCards();
 	}
 
 	public int[] getGameBoardSize() {