diff --git a/src/game/SwingGame.java b/src/game/SwingGame.java index 6d9fd7b..9503ea4 100644 --- a/src/game/SwingGame.java +++ b/src/game/SwingGame.java @@ -39,7 +39,7 @@ public static void main(String[] args){ SwingGame game = new SwingGame(); game.getPlayer(game.currentPlayer).deactiveCards(); - System.out.println("Player " + game.currentPlayer + "'s turn"); + game.printMessage("Player " + game.currentPlayer + "'s turn", 2); } @Override @@ -122,7 +122,7 @@ @Override public void mouseReleased(MouseEvent e) { if(!hintAvailable()){ - printMessage("No hints left!", 1); + printMessage("No hints left!", 0); return; } if(selectedCards > 0){ @@ -151,7 +151,7 @@ @Override public void mouseReleased(MouseEvent e) { if(!hintAvailable()){ - printMessage("No hints left!", 1); + printMessage("No hints left!", 0); return; } if(selectedCards > 0){ @@ -239,7 +239,7 @@ updateCards(selCardIndex); } players[currentPlayer].activeCards(); - printMessage("Player " + currentPlayer + " has finished his move!", 1); + printMessage("Player " + currentPlayer + " has finished his move!", 2); currentPlayer++; if(currentPlayer == NR_PLAYERS) currentPlayer = 0; players[currentPlayer].deactiveCards(); @@ -315,6 +315,7 @@ @Override protected void dealCards(){ + super.dealCards(); /* * PLAYER 0: SOUTH * PLAYER 1: EAST diff --git a/src/player/SwingPlayer.java b/src/player/SwingPlayer.java index 62d4c04..5977f4c 100644 --- a/src/player/SwingPlayer.java +++ b/src/player/SwingPlayer.java @@ -144,7 +144,7 @@ for(int i=0; i