external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ensure variants are only disabled for network play

Browse Source 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
This commit is contained in:
Jamin W. Collins
2018-03-01 04:41:30 -07:00
parent 4299491104
commit 81af09d86f
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
View File

@@ -93,7 +93,9 @@ public class VLobby implements ILobbyView {
private final VariantCheckBox vntPlanechase = new VariantCheckBox(GameType.Planechase); private final VariantCheckBox vntPlanechase = new VariantCheckBox(GameType.Planechase);
private final VariantCheckBox vntArchenemy = new VariantCheckBox(GameType.Archenemy); private final VariantCheckBox vntArchenemy = new VariantCheckBox(GameType.Archenemy);
private final VariantCheckBox vntArchenemyRumble = new VariantCheckBox(GameType.ArchenemyRumble); private final VariantCheckBox vntArchenemyRumble = new VariantCheckBox(GameType.ArchenemyRumble);
private final ImmutableList<VariantCheckBox> vntBoxes = private final ImmutableList<VariantCheckBox> vntBoxesLocal =
ImmutableList.of(vntVanguard, vntMomirBasic, vntCommander, vntTinyLeaders, vntPlanechase, vntArchenemy, vntArchenemyRumble);
private final ImmutableList<VariantCheckBox> vntBoxesNetwork =
ImmutableList.of(vntVanguard, vntMomirBasic, vntCommander, vntTinyLeaders /*, vntPlanechase, vntArchenemy, vntArchenemyRumble */); ImmutableList.of(vntVanguard, vntMomirBasic, vntCommander, vntTinyLeaders /*, vntPlanechase, vntArchenemy, vntArchenemyRumble */);
// Player frame elements // Player frame elements
@@ -153,6 +155,12 @@ public class VLobby implements ILobbyView {
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
//////////////////// Variants Panel //////////////////// //////////////////// Variants Panel ////////////////////
ImmutableList<VariantCheckBox> vntBoxes = null;
if (lobby.isAllowNetworking()) {
vntBoxes = vntBoxesNetwork;
} else {
vntBoxes = vntBoxesLocal;
}
variantsPanel.setOpaque(false); variantsPanel.setOpaque(false);
variantsPanel.add(newLabel("Variants:")); variantsPanel.add(newLabel("Variants:"));
@@ -230,12 +238,18 @@ public class VLobby implements ILobbyView {
activePlayersNum = lobby.getNumberOfSlots(); activePlayersNum = lobby.getNumberOfSlots();
addPlayerBtn.setEnabled(activePlayersNum < MAX_PLAYERS); addPlayerBtn.setEnabled(activePlayersNum < MAX_PLAYERS);
final boolean allowNetworking = lobby.isAllowNetworking();
ImmutableList<VariantCheckBox> vntBoxes = null;
if (allowNetworking) {
vntBoxes = vntBoxesNetwork;
} else {
vntBoxes = vntBoxesLocal;
}
for (final VariantCheckBox vcb : vntBoxes) { for (final VariantCheckBox vcb : vntBoxes) {
vcb.setSelected(hasVariant(vcb.variant)); vcb.setSelected(hasVariant(vcb.variant));
vcb.setEnabled(lobby.hasControl()); vcb.setEnabled(lobby.hasControl());
} }
final boolean allowNetworking = lobby.isAllowNetworking();
for (int i = 0; i < MAX_PLAYERS; i++) { for (int i = 0; i < MAX_PLAYERS; i++) {
final boolean hasPanel = i < playerPanels.size(); final boolean hasPanel = i < playerPanels.size();
if (i < activePlayersNum) { if (i < activePlayersNum) {