summaryrefslogtreecommitdiffstats
path: root/core/src/ch
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/ch')
-rw-r--r--core/src/ch/asynk/tankontank/game/Engagement.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java4
3 files changed, 2 insertions, 6 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Engagement.java b/core/src/ch/asynk/tankontank/game/Engagement.java
index df50123..1dc7ce6 100644
--- a/core/src/ch/asynk/tankontank/game/Engagement.java
+++ b/core/src/ch/asynk/tankontank/game/Engagement.java
@@ -36,8 +36,6 @@ public class Engagement implements Disposable, Pool.Poolable
public Unit attacker;
public Unit defender;
public List<Unit> assists;
- public Army attackerArmy;
- public Army defenderArmy;
public boolean success;
public int d1;
public int d2;
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 6be1a9c..a924f29 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -543,8 +543,6 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS
e.set(cnt, flk, def, tdf, wdf);
e.success = success;
- e.attackerArmy = ctrl.player.army;
- e.defenderArmy = ctrl.opponent.army;
}
private int doEngagement(Engagement e)
diff --git a/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java b/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java
index e524bf7..9e9df1c 100644
--- a/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java
+++ b/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java
@@ -94,9 +94,9 @@ public class EngagementPanel extends Patch implements Animation
attackR.write(String.format(" %2d", e.attackSum));
defenseR.write(String.format(" %2d", e.defenseSum));
if (e.success)
- winner = ((e.attackerArmy == Army.US) ? usFlag : geFlag);
+ winner = ((e.attacker.getArmy() == Army.US) ? usFlag : geFlag);
else
- winner = ((e.attackerArmy == Army.US) ? geFlag : usFlag);
+ winner = ((e.attacker.getArmy() == Army.US) ? geFlag : usFlag);
this.position = position;
placeElements();