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

Bugfix: Random color select in constructed submenu.

Browse Source
This commit is contained in:
Doublestrike
2012-03-04 08:10:59 +00:00
parent 91ede76761
commit 79acfb0c38
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/control/FControl.java
View File

@@ -50,7 +50,7 @@ public enum FControl {
private List<Shortcut> shortcuts; private List<Shortcut> shortcuts;
private JLayeredPane display; private JLayeredPane display;
private int state; private int state = -1;
private WindowListener waDefault, waConcede, waLeaveBazaar; private WindowListener waDefault, waConcede, waLeaveBazaar;

14
src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java
View File

@@ -34,6 +34,7 @@ import forge.deck.generate.Generate3ColorDeck;
import forge.deck.generate.Generate5ColorDeck; import forge.deck.generate.Generate5ColorDeck;
import forge.deck.generate.GenerateThemeDeck; import forge.deck.generate.GenerateThemeDeck;
import forge.game.GameNew; import forge.game.GameNew;
import forge.gui.GuiUtils;
import forge.gui.home.ICSubmenu; import forge.gui.home.ICSubmenu;
import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FLabel;
import forge.gui.toolbox.FOverlay; import forge.gui.toolbox.FOverlay;
@@ -360,8 +361,11 @@ public enum CSubmenuConstructed implements ICSubmenu {
Constant.Runtime.COMPUTER_DECK[0] = Constant.Runtime.COMPUTER_DECK[0] =
generateDeck(VSubmenuConstructed.SINGLETON_INSTANCE.getLstAIDecks(), PlayerType.COMPUTER); generateDeck(VSubmenuConstructed.SINGLETON_INSTANCE.getLstAIDecks(), PlayerType.COMPUTER);
if (Constant.Runtime.HUMAN_DECK[0] != null && Constant.Runtime.COMPUTER_DECK[0] != null) {
GameNew.newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]); GameNew.newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]);
overlay.hideOverlay(); }
GuiUtils.closeOverlay();
} }
/** Generates deck from current list selection(s). */ /** Generates deck from current list selection(s). */
@@ -488,10 +492,10 @@ public enum CSubmenuConstructed implements ICSubmenu {
while (x == -1 || x == 1 || x == 4) { while (x == -1 || x == 1 || x == 4) {
x = (int) Math.ceil(Math.random() * 5); x = (int) Math.ceil(Math.random() * 5);
} }
final int colorCount = x; final Integer colorCount = x;
final int maxCount = lst0.getModel().getSize(); final int maxCount = lst0.getModel().getSize();
int[] selectedIndices = new int[colorCount]; Integer[] selectedIndices = new Integer[colorCount];
x = -1; x = -1;
for (int i = 0; i < colorCount; i++) { for (int i = 0; i < colorCount; i++) {
@@ -502,8 +506,8 @@ public enum CSubmenuConstructed implements ICSubmenu {
} }
x = -1; x = -1;
} }
lst0.setSelectedIndices(selectedIndices);
selectedIndices = null; lst0.setSelectedIndices(ArrayUtils.toPrimitive(selectedIndices));
} }
/** @param lst0 &emsp; {@link javax.swing.JList} */ /** @param lst0 &emsp; {@link javax.swing.JList} */