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

Enabled team combo box on android now that multiplayer is possible, also attempted to prevent hanging on conceding in multiplayer games - only working on android so far

Browse Source
This commit is contained in:
austinio7116
2018-03-20 21:53:06 +00:00
committed by maustin
parent 94e255b198
commit 951a5dc978
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
View File

@@ -232,7 +232,7 @@ public class PlayerPanel extends FContainer {
setMayControl(mayControl0); setMayControl(mayControl0);
//disable team combo boxes for now //disable team combo boxes for now
cbTeam.setEnabled(false); cbTeam.setEnabled(true);
} }
public void initialize(FPref savedStateSetting, FPref savedStateSettingCommander, FPref savedStateSettingTinyLeader, DeckType defaultDeckType) { public void initialize(FPref savedStateSetting, FPref savedStateSettingCommander, FPref savedStateSettingTinyLeader, DeckType defaultDeckType) {

9
forge-gui/src/main/java/forge/match/AbstractGuiGame.java
View File

@@ -238,7 +238,12 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
// Don't immediately close, wait for win/lose screen // Don't immediately close, wait for win/lose screen
return false; return false;
} else { } else {
return true; for(PlayerView player: getLocalPlayers()){
if(!player.isAI()){
getGameController(player).nextGameDecision(NextGameDecision.QUIT);
}
}
return false;
} }
} }
else if (spectator == null) { else if (spectator == null) {
@@ -421,7 +426,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
* @return null if choices is missing, empty, or if the users' choices are * @return null if choices is missing, empty, or if the users' choices are
* empty; otherwise, returns the first item in the List returned by * empty; otherwise, returns the first item in the List returned by
* getChoices. * getChoices.
* @see #getChoices(String, int, int, Object...) * @see #getChoices(String, int, int, List)
*/ */
@Override @Override
public <T> T oneOrNone(final String message, final List<T> choices) { public <T> T oneOrNone(final String message, final List<T> choices) {