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

Bugfix to bugfix: Phase toggle prefs fixed

Browse Source 
Bugfix: Quest winlose crash fixed
This commit is contained in:
Doublestrike
2012-01-30 10:21:58 +00:00
parent e0b3c10755
commit 2187a3d495
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/quest/gui/QuestWinLoseHandler.java
View File

@@ -465,7 +465,7 @@ public class QuestWinLoseHandler extends ControlWinLose {
this.model.qData.addCredits(credTotal); this.model.qData.addCredits(credTotal);
// Generate Swing components and attach. // Generate Swing components and attach.
this.icoTemp = GuiUtils.getResizedIcon("GoldIcon.png", 0.5); this.icoTemp = GuiUtils.getResizedIcon(skin.getIcon(FSkin.QuestIcons.ICO_GOLD), 0.5);
this.lblTemp1 = new TitleLabel("Gameplay Results"); this.lblTemp1 = new TitleLabel("Gameplay Results");
@@ -568,7 +568,7 @@ public class QuestWinLoseHandler extends ControlWinLose {
this.model.qData.addCredits(questRewardCredits); this.model.qData.addCredits(questRewardCredits);
// Generate Swing components and attach. // Generate Swing components and attach.
this.icoTemp = GuiUtils.getResizedIcon("BoxIcon.png", 0.5); this.icoTemp = GuiUtils.getResizedIcon(skin.getIcon(FSkin.QuestIcons.ICO_BOX), 0.5);
this.lblTemp1 = new TitleLabel("Challenge Rewards for \"" + ((QuestChallenge) this.model.qEvent).getTitle() this.lblTemp1 = new TitleLabel("Challenge Rewards for \"" + ((QuestChallenge) this.model.qEvent).getTitle()
+ "\""); + "\"");
@@ -591,7 +591,7 @@ public class QuestWinLoseHandler extends ControlWinLose {
private void penalizeLoss() { private void penalizeLoss() {
int x = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.PENALTY_LOSS); int x = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.PENALTY_LOSS);
this.icoTemp = GuiUtils.getResizedIcon("HeartIcon.png", 0.5); this.icoTemp = GuiUtils.getResizedIcon(skin.getIcon(FSkin.QuestIcons.ICO_HEART), 0.5);
this.lblTemp1 = new TitleLabel("Gameplay Results"); this.lblTemp1 = new TitleLabel("Gameplay Results");

2
src/main/java/forge/view/GuiTopLevel.java
View File

@@ -407,6 +407,8 @@ public class GuiTopLevel extends JFrame implements Display, CardContainer {
fp.setPref(FPref.DEV_MILLING_LOSS, String.valueOf(Constant.Runtime.MILL[0])); fp.setPref(FPref.DEV_MILLING_LOSS, String.valueOf(Constant.Runtime.MILL[0]));
fp.setPref(FPref.UI_LAYOUT_PARAMS, String.valueOf(control.getMatchController().getView().getLayoutParams())); fp.setPref(FPref.UI_LAYOUT_PARAMS, String.valueOf(control.getMatchController().getView().getLayoutParams()));
fp.setPref(FPref.DEV_UNLIMITED_LAND, String.valueOf(v.getLblUnlimitedLands().getEnabled())); fp.setPref(FPref.DEV_UNLIMITED_LAND, String.valueOf(v.getLblUnlimitedLands().getEnabled()));
fp.save();
return true; return true;
} }