Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Showing already chosen cards in choice dialog

Browse source
This commit is contained in:
magenoxx 2012-06-27 18:44:03 +04:00
parent 638a6368d2
commit b5032226f4
9 changed files with 55 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -530,7 +530,7 @@ public class GamePanel extends javax.swing.JPanel {
updateGame(gameView);
Map<String, Serializable> options0 = options == null ? new HashMap<String, Serializable>() : options;
if (cardView != null && cardView.size() > 0) {
ShowCardsDialog dialog = showCards(message, cardView, required);
ShowCardsDialog dialog = showCards(message, cardView, required, options0);
options0.put("dialog", dialog);
}
this.feedbackPanel.getFeedback(required?FeedbackMode.INFORM:FeedbackMode.CANCEL, message, gameView.getSpecial(), options0);
@ -589,9 +589,9 @@ public class GamePanel extends javax.swing.JPanel {
this.abilityPicker.show(choices, MageFrame.getDesktop().getMousePosition());
}
private ShowCardsDialog showCards(String title, CardsView cards, boolean required) {
private ShowCardsDialog showCards(String title, CardsView cards, boolean required, Map<String, Serializable> options) {
ShowCardsDialog showCards = new ShowCardsDialog();
showCards.loadCards(title, cards, bigCard, Config.dimensionsEnlarged, gameId, required);
showCards.loadCards(title, cards, bigCard, Config.dimensionsEnlarged, gameId, required, options);
return showCards;
}