diff options
Diffstat (limited to 'src/jrummikub/control/RoundControl.java')
-rw-r--r-- | src/jrummikub/control/RoundControl.java | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java index 7cea255..dad2e30 100644 --- a/src/jrummikub/control/RoundControl.java +++ b/src/jrummikub/control/RoundControl.java @@ -149,17 +149,26 @@ public class RoundControl { return ret; } - void dealStone() { - gameState - .getActivePlayer() - .getHand() - .drop(gameState.getGameHeap().drawStone(), - new Position(Hand.WIDTH - 1, Hand.HEIGHT - 1)); + void dealStones(int count) { + IHand hand = gameState.getActivePlayer().getHand(); + int rowCount = hand.getRowCount(); + + for (int i = 0; i < count; ++i) { + if (hand.getFreeRowSpace(rowCount - 1) == 0) { + rowCount++; + } + + hand.drop(gameState.getGameHeap().drawStone(), new Position( + Hand.WIDTH - 1, rowCount - 1)); + } + } + + private void dealStone() { + dealStones(1); } private void dealPenalty(int count) { - for (int i = 0; i < count + 3; ++i) - dealStone(); + dealStones(count + 3); } private void win() { |