From 0c41c9d305e4ea0b3aa7cade1d690d98ec0ad1e8 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 15:33:11 +0000
Subject: [PATCH] Quest and Battle icons are now set properly in matches

---
 src/forge/quest/main/QuestMainPanel.java | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/forge/quest/main/QuestMainPanel.java b/src/forge/quest/main/QuestMainPanel.java
index 816302b6dc9..0477a0488d9 100644
--- a/src/forge/quest/main/QuestMainPanel.java
+++ b/src/forge/quest/main/QuestMainPanel.java
@@ -505,6 +505,8 @@ public class QuestMainPanel extends QuestAbstractPanel {
         Constant.Runtime.HumanDeck[0] = humanDeck;
         moveDeckToTop(humanDeckName);
 
+        Constant.Quest.oppIconName[0] = getMatchIcon();
+
         // Dev Mode occurs before Display
         Constant.Runtime.DevMode[0] = devModeCheckBox.isSelected();
 
@@ -539,11 +541,6 @@ public class QuestMainPanel extends QuestAbstractPanel {
         Deck computer = questData.ai_getDeckNewFormat((selectedOpponent).getName());
         Constant.Runtime.ComputerDeck[0] = computer;
 
-        String oppIconName = selectedOpponent.getName();
-        oppIconName = oppIconName.substring(0, oppIconName.length() - 1).trim() + ".jpg";
-
-        Constant.Quest.oppIconName[0] = oppIconName;
-
         AllZone.GameAction.newGame(
                 humanDeck,
                 computer,
@@ -561,7 +558,6 @@ public class QuestMainPanel extends QuestAbstractPanel {
         Constant.Runtime.ComputerDeck[0] = computerDeck;
 
         AllZone.QuestAssignment = selectedQuest;
-        Constant.Quest.oppIconName[0] = selectedQuest.getIconName();
 
         int extraLife = 0;
 
@@ -580,6 +576,20 @@ public class QuestMainPanel extends QuestAbstractPanel {
 
     }
 
+    String getMatchIcon(){
+        String oppIconName;
+
+        if (isShowingQuests){
+            Quest_Assignment selectedQuest = ((QuestQuest) selectedOpponent).getQuestAssignment();
+            oppIconName = selectedQuest.getIconName();
+        }
+
+        else{
+            oppIconName = selectedOpponent.getName();
+            oppIconName = oppIconName.substring(0, oppIconName.length() - 1).trim() + ".jpg";
+        }
+        return oppIconName;
+    }
     void showQuests() {
         if (isShowingQuests) {
             this.nextMatchLayout.show(nextMatchPanel, BATTLES);