From 06b83d8a5eb4af7efa0c4f59fea3aaea0ede2bea Mon Sep 17 00:00:00 2001 From: magenoxx Date: Tue, 4 Oct 2011 20:14:04 +0400 Subject: [PATCH] Fixed transform animation. --- .../java/org/mage/card/arcane/CardPanel.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java index c1d217841af..1b74297114d 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java @@ -845,29 +845,30 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti this.transformed = transformed; } - @Override - public void toggleTransformed() { - this.transformed = !this.transformed; - if (transformed) { - BufferedImage night = ImageManagerImpl.getInstance().getNightImage(); - dayNightButton.setIcon(new ImageIcon(night)); - this.temporary = this.gameCard; + @Override + public void toggleTransformed() { + this.transformed = !this.transformed; + if (transformed) { + BufferedImage night = ImageManagerImpl.getInstance().getNightImage(); + dayNightButton.setIcon(new ImageIcon(night)); if (this.gameCard.getSecondCardFace() == null) { + log.error("no second side for card to transform!"); return; } - if (!isPermanent) { + if (!isPermanent) { // use only for custom transformation (when pressing day-night button) + this.temporary = this.gameCard; update(this.gameCard.getSecondCardFace()); } updateImage(); - } else { - BufferedImage day = ImageManagerImpl.getInstance().getDayImage(); - dayNightButton.setIcon(new ImageIcon(day)); - this.gameCard = this.temporary; - this.temporary = null; - if (!isPermanent) { + } else { + BufferedImage day = ImageManagerImpl.getInstance().getDayImage(); + dayNightButton.setIcon(new ImageIcon(day)); + if (!isPermanent) { // use only for custom transformation (when pressing day-night button) + this.gameCard = this.temporary; + this.temporary = null; update(this.gameCard); } updateImage(); - } - } + } + } }