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

Fix for broken variants with new android multiplayer code

Browse Source
This commit is contained in:
austinio7116
2018-03-19 12:52:49 +00:00
committed by maustin
parent 35245d5268
commit 94e255b198
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -815,6 +815,10 @@ public class FDeckChooser extends FScreen {
/*if(selectedDeckType.equals(DeckType.STANDARD_CARDGEN_DECK)){ /*if(selectedDeckType.equals(DeckType.STANDARD_CARDGEN_DECK)){
return DeckgenUtil.buildCardGenDeck(lstDecks.getSelectedItem().getName()); return DeckgenUtil.buildCardGenDeck(lstDecks.getSelectedItem().getName());
}*/ }*/
//ensure a deck is selected first
if(lstDecks.getSelectedIndex() == -1){
lstDecks.setSelectedIndex(0);
}
DeckProxy proxy = lstDecks.getSelectedItem(); DeckProxy proxy = lstDecks.getSelectedItem();
if (proxy == null) { return null; } if (proxy == null) { return null; }
return proxy.getDeck(); return proxy.getDeck();

5
forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
View File

@@ -223,7 +223,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
} }
void updateLayoutForVariants() { void updateLayoutForVariants() {
for (int i = 0; i < MAX_PLAYERS; i++) { for (int i = 0; i < cbPlayerCount.getSelectedItem(); i++) {
playerPanels.get(i).updateVariantControlsVisibility(); playerPanels.get(i).updateVariantControlsVisibility();
} }
playersScroll.revalidate(); playersScroll.revalidate();
@@ -461,12 +461,11 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
@Override @Override
public void update(final boolean fullUpdate) { public void update(final boolean fullUpdate) {
int playerCount = lobby.getNumberOfSlots(); int playerCount = lobby.getNumberOfSlots();
//cbPlayerCount.setSelectedItem(playerCount);
updateVariantSelection(); updateVariantSelection();
final boolean allowNetworking = lobby.isAllowNetworking(); final boolean allowNetworking = lobby.isAllowNetworking();
for (int i = 0; i < MAX_PLAYERS; i++) { for (int i = 0; i < cbPlayerCount.getSelectedItem(); i++) {
final boolean hasPanel = i < playerPanels.size(); final boolean hasPanel = i < playerPanels.size();
if (i < playerCount) { if (i < playerCount) {
// visible panels // visible panels