From 604ef91282ad234130b1d46569efd486ab6c5024 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 16 May 2011 22:01:02 +0200
Subject: Fix dealing stones for more than 2 rows

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@244 72836036-5685-4462-b002-a69064685172
---
 src/jrummikub/control/RoundControl.java | 25 +++++++++++++++++--------
 src/jrummikub/control/TurnControl.java  |  5 -----
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'src/jrummikub/control')

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() {
diff --git a/src/jrummikub/control/TurnControl.java b/src/jrummikub/control/TurnControl.java
index 06e1d76..4652ea7 100644
--- a/src/jrummikub/control/TurnControl.java
+++ b/src/jrummikub/control/TurnControl.java
@@ -247,11 +247,6 @@ public class TurnControl {
 			if (x >= Hand.WIDTH) {
 				x = 0;
 				y++;
-
-				if (y >= Hand.HEIGHT) {
-					// TODO We can't handle this yet...
-					throw new ArrayIndexOutOfBoundsException();
-				}
 			}
 		}
 
-- 
cgit v1.2.3