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

update some Magic Numbers to constants

Browse Source
This commit is contained in:
slapshot5
2012-01-07 06:35:49 +00:00
parent aa38b9110b
commit 702826ad1e
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/control/home/ControlDraft.java
View File

@@ -10,6 +10,7 @@ import javax.swing.JOptionPane;
import forge.AllZone; import forge.AllZone;
import forge.Constant; import forge.Constant;
import forge.control.ControlAllUI;
import forge.deck.Deck; import forge.deck.Deck;
import forge.game.limited.BoosterDraft; import forge.game.limited.BoosterDraft;
import forge.game.limited.CardPoolLimitation; import forge.game.limited.CardPoolLimitation;
@@ -101,7 +102,7 @@ public class ControlDraft {
} }
GuiTopLevel g = (GuiTopLevel) AllZone.getDisplay(); GuiTopLevel g = (GuiTopLevel) AllZone.getDisplay();
g.getController().changeState(1); g.getController().changeState(ControlAllUI.MATCH_SCREEN);
g.getController().getMatchController().initMatch(); g.getController().getMatchController().initMatch();
AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]); AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]);
} }

2
src/main/java/forge/control/home/ControlQuest.java
View File

@@ -202,7 +202,7 @@ public class ControlQuest {
Constant.Quest.OPP_ICON_NAME[0] = event.getIcon(); Constant.Quest.OPP_ICON_NAME[0] = event.getIcon();
GuiTopLevel g = (GuiTopLevel) AllZone.getDisplay(); GuiTopLevel g = (GuiTopLevel) AllZone.getDisplay();
g.getController().changeState(1); g.getController().changeState(ControlAllUI.MATCH_SCREEN);
g.getController().getMatchController().initMatch(); g.getController().getMatchController().initMatch();
AllZone.getMatchState().reset(); AllZone.getMatchState().reset();

2
src/main/java/forge/control/home/ControlSealed.java
View File

@@ -76,7 +76,7 @@ public class ControlSealed {
Constant.Runtime.COMPUTER_DECK[0] = aiDecks.get("AI_" + human.getName()); Constant.Runtime.COMPUTER_DECK[0] = aiDecks.get("AI_" + human.getName());
ControlAllUI c = ((GuiTopLevel) AllZone.getDisplay()).getController(); ControlAllUI c = ((GuiTopLevel) AllZone.getDisplay()).getController();
c.changeState(1); c.changeState(ControlAllUI.MATCH_SCREEN);
c.getMatchController().initMatch(); c.getMatchController().initMatch();
System.out.println(Constant.Runtime.COMPUTER_DECK[0]); System.out.println(Constant.Runtime.COMPUTER_DECK[0]);
System.out.println(Constant.Runtime.HUMAN_DECK[0]); System.out.println(Constant.Runtime.HUMAN_DECK[0]);

3
src/main/java/forge/view/swing/GuiHomeScreen.java
View File

@@ -61,6 +61,7 @@ import forge.GuiImportPicture;
import forge.MyRandom; import forge.MyRandom;
import forge.PlayerType; import forge.PlayerType;
import forge.Singletons; import forge.Singletons;
import forge.control.ControlAllUI;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckGeneration; import forge.deck.DeckGeneration;
import forge.deck.DeckManager; import forge.deck.DeckManager;
@@ -1203,7 +1204,7 @@ public class GuiHomeScreen {
GuiTopLevel g = ((GuiTopLevel) AllZone.getDisplay()); GuiTopLevel g = ((GuiTopLevel) AllZone.getDisplay());
g.getController().changeState(1); g.getController().changeState(ControlAllUI.MATCH_SCREEN);
g.getController().getMatchController().initMatch(); g.getController().getMatchController().initMatch();
Constant.Runtime.SMOOTH[0] = OldGuiNewGame.getSmoothLandCheckBox().isSelected(); Constant.Runtime.SMOOTH[0] = OldGuiNewGame.getSmoothLandCheckBox().isSelected();