Naming fixes

Dev
ToOgFyrreTyvende · Jan 20, 2019 · 8ff1c60 · 8ff1c60
2 parents 2e16efc + f2f0308
commit 8ff1c60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/Controller/GameController.java b/src/main/java/Controller/GameController.java
@@ -1,6 +1,5 @@
 package Controller;
 
-import Model.Fields.PropertyField;
 import Model.Game;
 import Model.GameBoard;
 import Model.Player;
@@ -32,12 +31,12 @@ public GameController(GameBoard board, GameView view){
         this.diceController = new DiceController(this);
         this.endTurnController = new EndTurnController(this);
 
-        initalizeGame();
+        initializeGame();
         currentController = diceController;
-        testPlayTurn(game.getActivePlayer());
+        playTurn(game.getActivePlayer());
     }
 
-    private void initalizeGame(){
+    private void initializeGame(){
         // pga. abstrakt klasse, har vi polymorfi, og kan kalde "getantalspillere" for ethvert view
         int playerAmount = this.view.getPlayerCount();
         String[] playerNames = new String[playerAmount];
@@ -51,7 +50,7 @@ private void initalizeGame(){
         this.view.resetBoard();
     }
 
-    private void testPlayTurn(Player player){
+    private void playTurn(Player player){
         Player activePlayer = player;
         while (!this.game.isEnded()){
             resetControllers();

diff --git a/src/main/java/Model/Game.java b/src/main/java/Model/Game.java
@@ -42,7 +42,8 @@ public Game(GameBoard gameboard, String[] playerNames){
 
         createPlayers(playerNames);
 
-        dice = new DemoDice();
+        dice = new Dice();
+//        dice = new DemoDice();
 
         activePlayer = players[0];