diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-02-18 12:34:16 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-02-18 12:34:16 +0100 |
commit | de7a33881b3f20cf29a36175831409411ff8fe56 (patch) | |
tree | 65b1c106f7ef977428d442949289bdd39ba9687a /core/src/ch/asynk/tankontank/game/hud | |
parent | 30a2d67036412ecb5f3ba08ef6fcaeebc7b346af (diff) | |
download | RustAndDust-de7a33881b3f20cf29a36175831409411ff8fe56.zip RustAndDust-de7a33881b3f20cf29a36175831409411ff8fe56.tar.gz |
Board: clear Move and Path Pool at dispose
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/hud')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java b/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java index 6da7406..e524bf7 100644 --- a/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java +++ b/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java @@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.TextureAtlas; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.game.Map.Engagement; +import ch.asynk.tankontank.game.Engagement; import ch.asynk.tankontank.game.Army; import ch.asynk.tankontank.engine.gfx.Animation; import ch.asynk.tankontank.engine.gfx.animations.DiceAnimation; @@ -91,12 +91,12 @@ public class EngagementPanel extends Patch implements Animation defense.write(String.format("%d + %d =", e.unitDefense, e.terrainDefense)); else defense.write(String.format("%d + %d + %d =", e.unitDefense, e.terrainDefense, e.weatherDefense)); - attackR.write(String.format(" %2d", e.attack)); - defenseR.write(String.format(" %2d", e.defense)); + attackR.write(String.format(" %2d", e.attackSum)); + defenseR.write(String.format(" %2d", e.defenseSum)); if (e.success) - winner = ((e.attacker == Army.US) ? usFlag : geFlag); + winner = ((e.attackerArmy == Army.US) ? usFlag : geFlag); else - winner = ((e.attacker == Army.US) ? geFlag : usFlag); + winner = ((e.attackerArmy == Army.US) ? geFlag : usFlag); this.position = position; placeElements(); |