summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/model/RoundState.java
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-05-18 16:02:23 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-05-18 16:02:23 +0200
commit5169f31af06926f4c268062791f648f1fdd91656 (patch)
tree4f490bfbcb72a8c1432a5b68cf3726f6373d1e72 /src/jrummikub/model/RoundState.java
parent0b252810c9eb0f822c50d144b2ef0c652202d871 (diff)
downloadJRummikub-5169f31af06926f4c268062791f648f1fdd91656.tar
JRummikub-5169f31af06926f4c268062791f648f1fdd91656.zip
Add GameSettings with the initial meld threshold
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@251 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/model/RoundState.java')
-rw-r--r--src/jrummikub/model/RoundState.java20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/jrummikub/model/RoundState.java b/src/jrummikub/model/RoundState.java
index 82d93b0..4a27d2d 100644
--- a/src/jrummikub/model/RoundState.java
+++ b/src/jrummikub/model/RoundState.java
@@ -4,17 +4,24 @@ import java.awt.Color;
import java.util.ArrayList;
import java.util.List;
-/** Class managing the overall and momentary GameState */
+/** Class managing the overall and momentary RoundState */
public class RoundState implements IRoundState {
+ private GameSettings gameSettings;
+
private ITable table;
private List<Player> players;
private int activePlayer;
private StoneHeap gameHeap;
- /**
- * Create a new GameState with an empty table and (currently) 4 new players.
+ /**
+ * Create a new RoundState with an empty table
+ *
+ * @param gameSettings
+ * the game settings
*/
- public RoundState() {
+ public RoundState(GameSettings gameSettings) {
+ this.gameSettings = gameSettings;
+
table = new Table();
players = new ArrayList<Player>();
players.add(new Player("Ida", Color.RED));
@@ -59,4 +66,9 @@ public class RoundState implements IRoundState {
public StoneHeap getGameHeap() {
return gameHeap;
}
+
+ @Override
+ public GameSettings getGameSettings() {
+ return gameSettings;
+ }
}