summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/JRummikub.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/JRummikub.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/JRummikub.java')
-rw-r--r--src/jrummikub/JRummikub.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/jrummikub/JRummikub.java b/src/jrummikub/JRummikub.java
index e9fd9dd..a1fada3 100644
--- a/src/jrummikub/JRummikub.java
+++ b/src/jrummikub/JRummikub.java
@@ -3,6 +3,7 @@ package jrummikub;
import javax.swing.UIManager;
import jrummikub.control.GameControl;
+import jrummikub.model.GameSettings;
import jrummikub.view.impl.View;
/**
@@ -24,9 +25,10 @@ public class JRummikub {
} catch (Exception e) {
}
+ GameSettings gameSettings = new GameSettings();
View view = new View();
- GameControl gameControl = new GameControl(view);
+ GameControl gameControl = new GameControl(gameSettings, view);
gameControl.startGame();
}