diff options
| author | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-05-30 20:16:48 +0200 |
|---|---|---|
| committer | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-05-30 20:16:48 +0200 |
| commit | 1660736239d9f437f0ffa336d3f3bb8ed7ae407f (patch) | |
| tree | 96185492c79b33ec3354b61550edff3f81c90aa1 /src/jrummikub/control | |
| parent | c398c081ed4d83660ec867cabfb0ee9bc56b90ad (diff) | |
| download | JRummikub-1660736239d9f437f0ffa336d3f3bb8ed7ae407f.tar JRummikub-1660736239d9f437f0ffa336d3f3bb8ed7ae407f.zip | |
Man kann jetzt die Anzahl der Steinsätze einstellen
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@328 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control')
| -rw-r--r-- | src/jrummikub/control/SettingsControl.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/jrummikub/control/SettingsControl.java b/src/jrummikub/control/SettingsControl.java index 9cb216d..f12f1ad 100644 --- a/src/jrummikub/control/SettingsControl.java +++ b/src/jrummikub/control/SettingsControl.java @@ -56,10 +56,6 @@ public class SettingsControl { * Start the operation of the settings control */ public void startSettings() { - view.getSettingsPanel().setInitialMeldThreshold( - settings.getInitialMeldThreshold()); - view.getSettingsPanel().setJokerNumber(settings.getJokerNumber()); - connections.add(view.getSettingsPanel() .getChangeInitialMeldThresholdEvent() .add(new IListener1<Integer>() { @@ -79,6 +75,15 @@ public class SettingsControl { } })); + connections.add(view.getSettingsPanel().getChangeStoneSetNumberEvent() + .add(new IListener1<Integer>() { + @Override + public void handle(Integer value) { + settings.setStoneSetNumber(value); + update(); + } + })); + addPlayerSettingsListeners(); view.showSettingsPanel(true); @@ -237,7 +242,8 @@ public class SettingsControl { int totalStonesDealt = settings.getNumberOfStonesDealt() * settings.getPlayerList().size(); - int totalStones = settings.getHighestCard() * settings.getStoneSetNumber() + int totalStones = settings.getHighestCard() + * settings.getStoneSetNumber() * settings.getStoneColors().size() + settings.getJokerNumber(); if (totalStones <= totalStonesDealt) { |