From 702826ad1ef1275094b7f17f2ad4e6c67bf13d5f Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Sat, 7 Jan 2012 06:35:49 +0000 Subject: [PATCH] update some Magic Numbers to constants --- src/main/java/forge/control/home/ControlDraft.java | 3 ++- src/main/java/forge/control/home/ControlQuest.java | 2 +- src/main/java/forge/control/home/ControlSealed.java | 2 +- src/main/java/forge/view/swing/GuiHomeScreen.java | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/control/home/ControlDraft.java b/src/main/java/forge/control/home/ControlDraft.java index b77f331cbb8..6ccc189fcf8 100644 --- a/src/main/java/forge/control/home/ControlDraft.java +++ b/src/main/java/forge/control/home/ControlDraft.java @@ -10,6 +10,7 @@ import javax.swing.JOptionPane; import forge.AllZone; import forge.Constant; +import forge.control.ControlAllUI; import forge.deck.Deck; import forge.game.limited.BoosterDraft; import forge.game.limited.CardPoolLimitation; @@ -101,7 +102,7 @@ public class ControlDraft { } GuiTopLevel g = (GuiTopLevel) AllZone.getDisplay(); - g.getController().changeState(1); + g.getController().changeState(ControlAllUI.MATCH_SCREEN); g.getController().getMatchController().initMatch(); AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]); } diff --git a/src/main/java/forge/control/home/ControlQuest.java b/src/main/java/forge/control/home/ControlQuest.java index 40bfd2ae8be..b57ae674dee 100644 --- a/src/main/java/forge/control/home/ControlQuest.java +++ b/src/main/java/forge/control/home/ControlQuest.java @@ -202,7 +202,7 @@ public class ControlQuest { Constant.Quest.OPP_ICON_NAME[0] = event.getIcon(); GuiTopLevel g = (GuiTopLevel) AllZone.getDisplay(); - g.getController().changeState(1); + g.getController().changeState(ControlAllUI.MATCH_SCREEN); g.getController().getMatchController().initMatch(); AllZone.getMatchState().reset(); diff --git a/src/main/java/forge/control/home/ControlSealed.java b/src/main/java/forge/control/home/ControlSealed.java index f8e8c5160d9..7516261aacf 100644 --- a/src/main/java/forge/control/home/ControlSealed.java +++ b/src/main/java/forge/control/home/ControlSealed.java @@ -76,7 +76,7 @@ public class ControlSealed { Constant.Runtime.COMPUTER_DECK[0] = aiDecks.get("AI_" + human.getName()); ControlAllUI c = ((GuiTopLevel) AllZone.getDisplay()).getController(); - c.changeState(1); + c.changeState(ControlAllUI.MATCH_SCREEN); c.getMatchController().initMatch(); System.out.println(Constant.Runtime.COMPUTER_DECK[0]); System.out.println(Constant.Runtime.HUMAN_DECK[0]); diff --git a/src/main/java/forge/view/swing/GuiHomeScreen.java b/src/main/java/forge/view/swing/GuiHomeScreen.java index 0aec08b3a64..6b3730334f2 100644 --- a/src/main/java/forge/view/swing/GuiHomeScreen.java +++ b/src/main/java/forge/view/swing/GuiHomeScreen.java @@ -61,6 +61,7 @@ import forge.GuiImportPicture; import forge.MyRandom; import forge.PlayerType; import forge.Singletons; +import forge.control.ControlAllUI; import forge.deck.Deck; import forge.deck.DeckGeneration; import forge.deck.DeckManager; @@ -1203,7 +1204,7 @@ public class GuiHomeScreen { GuiTopLevel g = ((GuiTopLevel) AllZone.getDisplay()); - g.getController().changeState(1); + g.getController().changeState(ControlAllUI.MATCH_SCREEN); g.getController().getMatchController().initMatch(); Constant.Runtime.SMOOTH[0] = OldGuiNewGame.getSmoothLandCheckBox().isSelected();