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

- Cleanup for targeting overlay not selected.

Browse Source
This commit is contained in:
Sloth
2013-04-21 14:42:39 +00:00
parent 197c64777b
commit 55674b2f85
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/game/phase/Combat.java
View File

@@ -331,7 +331,7 @@ public class Combat {
* @return a boolean. * @return a boolean.
*/ */
public final boolean isAttacking(final Card c) { public final boolean isAttacking(final Card c) {
return this.attackerMap.get(c) != null; return this.attackerMap.containsKey(c);
} }
/** /**

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

@@ -94,9 +94,11 @@ public enum TargetingOverlay {
for (CardPanel c : cPanels) { for (CardPanel c : cPanels) {
if (c.isSelected()) { if (c.isSelected()) {
activePanel = c; activePanel = c;
break;
} }
} }
} }
if (activePanel == null) { return; }
break; break;
default: default:
// Draw all // Draw all
@@ -121,7 +123,6 @@ public enum TargetingOverlay {
if (CDock.SINGLETON_INSTANCE.getArcState() == 1) { if (CDock.SINGLETON_INSTANCE.getArcState() == 1) {
// Only work with the active panel // Only work with the active panel
if (activePanel == null) { return; }
Card c = activePanel.getCard(); Card c = activePanel.getCard();
Card enchanting = c.getEnchantingCard(); Card enchanting = c.getEnchantingCard();
@@ -173,16 +174,17 @@ public enum TargetingOverlay {
if (!c.isShowing()) { if (!c.isShowing()) {
continue; continue;
} }
Card card = c.getCard();
// Enchantments // Enchantments
Card enchanting = c.getCard().getEnchantingCard(); Card enchanting = card.getEnchantingCard();
if (enchanting != null) { if (enchanting != null) {
if (enchanting.getController().equals(c.getCard().getController())) { if (enchanting.getController().equals(card.getController())) {
continue; continue;
} }
arcs.add(new Point[]{ arcs.add(new Point[]{
endpoints.get(enchanting.getUniqueNumber()), endpoints.get(enchanting.getUniqueNumber()),
endpoints.get(c.getCard().getUniqueNumber()) endpoints.get(card.getUniqueNumber())
}); });
} }
} }
@@ -291,13 +293,13 @@ public enum TargetingOverlay {
if (overlaystate == 0) { return; } if (overlaystate == 0) { return; }
// Arc drawing // Arc drawing
assembleArcs();
if (arcs.isEmpty()) { return; }
Graphics2D g2d = (Graphics2D) g; Graphics2D g2d = (Graphics2D) g;
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON); RenderingHints.VALUE_ANTIALIAS_ON);
Color color = FSkin.getColor(FSkin.Colors.CLR_ACTIVE);
assembleArcs();
if (arcs.size() < 1) { return; }
for (Point[] p : arcs) { for (Point[] p : arcs) {
if (p[0] == null || p[1] == null) { if (p[0] == null || p[1] == null) {
@@ -309,7 +311,6 @@ public enum TargetingOverlay {
int startX = (int) p[1].getX(); int startX = (int) p[1].getX();
int startY = (int) p[1].getY(); int startY = (int) p[1].getY();
Color color = FSkin.getColor(FSkin.Colors.CLR_ACTIVE);
drawArrow(g2d, startX, startY, endX, endY, color); drawArrow(g2d, startX, startY, endX, endY, color);
} }