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

Show Human/Network type correctly on game join

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@435 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-14 17:18:13 +02:00
parent ebacf1ae74
commit 79767f762e
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/jrummikub/control/network/GameJoinControl.java
View file

@ -3,6 +3,9 @@ package jrummikub.control.network;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jrummikub.model.GameSettings;
import jrummikub.model.PlayerSettings;
import jrummikub.model.PlayerSettings.Type;
import jrummikub.util.Connection; import jrummikub.util.Connection;
import jrummikub.util.GameData; import jrummikub.util.GameData;
import jrummikub.util.IListener1; import jrummikub.util.IListener1;
@ -30,13 +33,28 @@ public class GameJoinControl {
@Override @Override
public void handle(GameData data) { public void handle(GameData data) {
if (data.getGameID().equals(gameData.getGameID())) { if (data.getGameID().equals(gameData.getGameID())) {
gameData.setGameSettings(data.getGameSettings()); GameSettings settings = data.getGameSettings();
view.getSettingsPanel().setGameSettings(data.getGameSettings());
fixGameSettings(settings);
gameData.setGameSettings(settings);
view.getSettingsPanel().setGameSettings(settings);
} }
} }
})); }));
} }
private void fixGameSettings(GameSettings settings) {
for (PlayerSettings player : settings.getPlayerList()) {
if (player.getType() == Type.HUMAN) {
player.setType(Type.NETWORK);
} else if (player.getType() == Type.NETWORK
&& player.getName().equals(connectionControl.getNickname())) {
player.setType(Type.HUMAN);
}
}
}
public void startGameJoin() { public void startGameJoin() {
view.showSettingsPanel(true); view.showSettingsPanel(true);
} }