summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/jrummikub/control/ApplicationControl.java2
-rw-r--r--src/jrummikub/control/SettingsControl.java8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/jrummikub/control/ApplicationControl.java b/src/jrummikub/control/ApplicationControl.java
index 8e09853..7a3113f 100644
--- a/src/jrummikub/control/ApplicationControl.java
+++ b/src/jrummikub/control/ApplicationControl.java
@@ -25,7 +25,7 @@ public class ApplicationControl {
* Starts the application by showing the game settings dialog panel
*/
public void startApplication() {
- SettingsControl settingsControl = new SettingsControl(view);
+ SettingsControl settingsControl = new SettingsControl(view, new GameSettings());
settingsControl.getStartGameEvent().add(new IListener1<GameSettings>() {
@Override
diff --git a/src/jrummikub/control/SettingsControl.java b/src/jrummikub/control/SettingsControl.java
index 7def918..b294cae 100644
--- a/src/jrummikub/control/SettingsControl.java
+++ b/src/jrummikub/control/SettingsControl.java
@@ -19,17 +19,19 @@ public class SettingsControl {
private IView view;
private Event1<GameSettings> startGameEvent = new Event1<GameSettings>();
- private GameSettings settings = new GameSettings();
+ private GameSettings settings;
/**
* Create a new settings control
*
* @param view
* the view to use
+ * @param settings
+ * initial game settings
*/
- public SettingsControl(IView view) {
+ public SettingsControl(IView view, GameSettings settings) {
this.view = view;
-
+ this.settings = settings;
addPlayer();
addPlayer();
}