neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Checking whether redealing is allowed

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@290 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-05-27 18:55:19 +02:00
parent ffeefad257
commit 5029ff206a
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/jrummikub/control/RoundControl.java
View file

@ -69,8 +69,6 @@ public class RoundControl {
startTurn(); startTurn();
} }
})); }));
prepareTurn(); prepareTurn();
} }
@ -81,11 +79,19 @@ public class RoundControl {
view.getTablePanel().setStoneSets(clonedTable); view.getTablePanel().setStoneSets(clonedTable);
view.setCurrentPlayerName(roundState.getActivePlayer() view.setCurrentPlayerName(roundState.getActivePlayer()
.getPlayerSettings().getName()); .getPlayerSettings().getName());
} }
private void startTurn() { private void startTurn() {
boolean inspectOnly = roundState.getTurnNumber() < 1;
boolean mayRedeal = inspectOnly
&& roundState.getActivePlayer().getHand()
.getIdenticalStoneCount() >= 3;
view.getPlayerPanel().setEndTurnMode(inspectOnly, mayRedeal);
TurnControl turnControl = new TurnControl(roundState.getActivePlayer() TurnControl turnControl = new TurnControl(roundState.getActivePlayer()
.getHand(), clonedTable, view, roundState.getTurnNumber() < 1); .getHand(), clonedTable, view, inspectOnly);
turnControl.getEndOfTurnEvent().add(new IListener() { turnControl.getEndOfTurnEvent().add(new IListener() {
@Override @Override
@ -93,7 +99,7 @@ public class RoundControl {
endOfTurn(); endOfTurn();
} }
}); });
turnControl.getRedealEvent().add(new IListener() { turnControl.getRedealEvent().add(new IListener() {
@Override @Override
public void handle() { public void handle() {