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

restore targeting arcs

Browse Source
This commit is contained in:
Maxmtg
2013-06-26 21:24:36 +00:00
parent bb22cc6ba9
commit 0387d9a82e
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/gui/match/TargetingOverlay.java
View File

@@ -78,9 +78,6 @@ public enum TargetingOverlay {
// positions have changed or not. Could perform better if // positions have changed or not. Could perform better if
// it checked for a state change. Doublestrike 28-09-12 // it checked for a state change. Doublestrike 28-09-12
private void assembleArcs(Combat combat) { private void assembleArcs(Combat combat) {
arcs.clear();
cardPanels.clear();
//List<VField> fields = VMatchUI.SINGLETON_INSTANCE.getFieldViews(); //List<VField> fields = VMatchUI.SINGLETON_INSTANCE.getFieldViews();
switch (CDock.SINGLETON_INSTANCE.getArcState()) { switch (CDock.SINGLETON_INSTANCE.getArcState()) {
@@ -201,6 +198,7 @@ public enum TargetingOverlay {
}); });
} }
if ( null != combat ) {
for (Card attackingCard : combat.getAttackers()) { for (Card attackingCard : combat.getAttackers()) {
temp = combat.getBlockers(attackingCard); temp = combat.getBlockers(attackingCard);
for (Card blockingCard : temp) { for (Card blockingCard : temp) {
@@ -211,6 +209,7 @@ public enum TargetingOverlay {
}); });
} }
} }
}
} else { } else {
// Work with all card panels currently visible // Work with all card panels currently visible
@@ -235,6 +234,7 @@ public enum TargetingOverlay {
} }
// Combat cards // Combat cards
if ( null != combat )
for (Card attackingCard : combat.getAttackers()) { for (Card attackingCard : combat.getAttackers()) {
temp = combat.getBlockers(attackingCard); temp = combat.getBlockers(attackingCard);
for (Card blockingCard : temp) { for (Card blockingCard : temp) {
@@ -339,7 +339,9 @@ public enum TargetingOverlay {
if (overlaystate == 0) { return; } if (overlaystate == 0) { return; }
// Arc drawing // Arc drawing
if( null != combat ) arcs.clear();
cardPanels.clear();
assembleArcs(combat); assembleArcs(combat);
if (arcs.isEmpty()) { return; } if (arcs.isEmpty()) { return; }