summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/control/network/NetworkRoundControl.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/jrummikub/control/network/NetworkRoundControl.java')
-rw-r--r--src/jrummikub/control/network/NetworkRoundControl.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/jrummikub/control/network/NetworkRoundControl.java b/src/jrummikub/control/network/NetworkRoundControl.java
index a9775b7..81820e7 100644
--- a/src/jrummikub/control/network/NetworkRoundControl.java
+++ b/src/jrummikub/control/network/NetworkRoundControl.java
@@ -2,9 +2,10 @@ package jrummikub.control.network;
import jrummikub.control.RoundControl;
import jrummikub.control.turn.ITurnControl;
+import jrummikub.model.IHand;
import jrummikub.model.IRoundState;
import jrummikub.model.ITable;
-import jrummikub.model.PlayerSettings;
+import jrummikub.model.PlayerSettings.Type;
import jrummikub.util.IListener1;
import jrummikub.view.IView;
@@ -23,7 +24,8 @@ public class NetworkRoundControl extends RoundControl {
new IListener1<IRoundState>() {
@Override
public void handle(IRoundState state) {
- NetworkControl.fixGameSettings(state.getGameSettings(), connectionControl.getNickname());
+ NetworkControl.fixGameSettings(state.getGameSettings(),
+ connectionControl.getNickname());
setRoundState(state);
startTurn();
@@ -42,8 +44,8 @@ public class NetworkRoundControl extends RoundControl {
}
@Override
- protected ITurnControl createTurnControl(PlayerSettings playerSettings) {
- switch (playerSettings.getType()) {
+ protected ITurnControl createTurnControl(Type type) {
+ switch (type) {
case HUMAN:
currentlyActive = true;
break;
@@ -56,7 +58,7 @@ public class NetworkRoundControl extends RoundControl {
return new NetworkTurnControl(connectionControl);
}
- return super.createTurnControl(playerSettings);
+ return super.createTurnControl(type);
}
@Override
@@ -71,11 +73,11 @@ public class NetworkRoundControl extends RoundControl {
}
@Override
- protected void endOfTurn(ITable newTable) {
+ protected void endOfTurn(IHand oldHand, ITable oldTable, ITable newTable) {
if (currentlyActive) {
- connectionControl.endTurn(newTable);
+ connectionControl.endTurn(oldHand, oldTable, newTable);
}
- super.endOfTurn(newTable);
+ super.endOfTurn(oldHand, oldTable, newTable);
}
}