Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove obsolete method and associated code and icons.

master
lodici 2016-01-27 00:24:07 +00:00
parent fae9682418
commit a6d335ec0e
5 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/magic/data/icons/attack.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 166 B

BIN
resources/magic/data/icons/block.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 426 B

2
src/magic/data/MagicIcon.java
View File

@ -90,8 +90,6 @@ public enum MagicIcon {
REGENERATED("regenerated.gif"),
DAMAGE("damage.gif"),
COMBAT("combat.gif"),
ATTACK("attack.gif"),
BLOCK("block.gif"),
BLOCKED("blocked.gif"),
LOSE("lose.png"),
TARGET("target.gif"),

13
src/magic/ui/MagicImages.java
View File

@ -16,7 +16,6 @@ import magic.model.MagicCardDefinition;
import magic.model.MagicColor;
import magic.model.MagicDeck;
import magic.model.MagicManaType;
import magic.model.MagicPermanent;
import magic.model.player.PlayerProfile;
import magic.ui.cardBuilder.renderers.CardBuilder;
import magic.ui.prefs.ImageSizePresets;
@ -137,18 +136,6 @@ public final class MagicImages {
throw new RuntimeException("No icon for MagicColor " + c);
}
public static ImageIcon getIcon(MagicPermanent perm) {
if (perm.isAttacking()) {
return getIcon(MagicIcon.ATTACK);
} else if (perm.isBlocking()) {
return getIcon(MagicIcon.BLOCK);
} else if (perm.isCreature()) {
return getIcon(MagicIcon.CREATURE);
} else {
return getIcon(perm.getCardDefinition());
}
}
public static ImageIcon getIcon(MagicCardDefinition cdef) {
if (cdef.isLand()) {
return getIcon(MagicIcon.LAND);

4
src/magic/ui/duel/viewer/info/PermanentViewerInfo.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import javax.swing.ImageIcon;
import magic.model.MagicAbility;
import magic.model.MagicCardDefinition;
import magic.model.MagicColor;
@ -14,7 +13,6 @@ import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.MagicType;
import magic.model.stack.MagicItemOnStack;
import magic.ui.MagicImages;
public class PermanentViewerInfo {
@ -45,7 +43,6 @@ public class PermanentViewerInfo {
public final MagicCardDefinition cardDefinition;
public final String name;
public final String blockedName;
public final ImageIcon icon;
public final String powerToughness;
public final Set<MagicAbility> abilityFlags;
public final int damage;
@ -72,7 +69,6 @@ public class PermanentViewerInfo {
this.permanent=permanent;
cardDefinition=permanent.getCardDefinition();
name=permanent.getName();
icon=MagicImages.getIcon(permanent);
powerToughness=getPowerToughness(permanent);
abilityFlags=permanent.getAbilityFlags();
damage=permanent.getDamage();