diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-02-10 17:23:00 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-02-10 17:23:00 +0100 |
commit | 74ad2af35e4bf812fb6d4f3af64b7a3b6b37b2cf (patch) | |
tree | 5d378887c540124d34fa10f204928d956f3067f1 /core/src/ch/asynk/tankontank | |
parent | 3801826023cfa8afc43f155e3f32d2f2ede47cef (diff) | |
download | RustAndDust-74ad2af35e4bf812fb6d4f3af64b7a3b6b37b2cf.zip RustAndDust-74ad2af35e4bf812fb6d4f3af64b7a3b6b37b2cf.tar.gz |
Engagement -> EngagementPanel
Diffstat (limited to 'core/src/ch/asynk/tankontank')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Hud.java | 6 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java (renamed from core/src/ch/asynk/tankontank/game/hud/Engagement.java) | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Hud.java b/core/src/ch/asynk/tankontank/game/Hud.java index 0e0a3a2..02472df 100644 --- a/core/src/ch/asynk/tankontank/game/Hud.java +++ b/core/src/ch/asynk/tankontank/game/Hud.java @@ -20,7 +20,7 @@ import ch.asynk.tankontank.ui.Widget; import ch.asynk.tankontank.game.hud.PlayerInfo; import ch.asynk.tankontank.game.hud.ActionButtons; import ch.asynk.tankontank.game.hud.StatisticsPanel; -import ch.asynk.tankontank.game.hud.Engagement; +import ch.asynk.tankontank.game.hud.EngagementPanel; import ch.asynk.tankontank.TankOnTank; @@ -39,7 +39,7 @@ public class Hud implements Disposable, Animation private Msg msg; private StatisticsPanel stats; - private Engagement engagement; + private EngagementPanel engagement; private OkCancel okCancel; private LinkedList<Widget> dialogs = new LinkedList<Widget>(); @@ -55,7 +55,7 @@ public class Hud implements Disposable, Animation msg = new Msg(game.fontB, game.uiAtlas); okCancel = new OkCancel(game.fontB, game.uiAtlas); stats = new StatisticsPanel(game.fontB, game.uiAtlas); - engagement = new Engagement(game.fontB, game.uiAtlas, hudAtlas); + engagement = new EngagementPanel(game.fontB, game.uiAtlas, hudAtlas); } @Override diff --git a/core/src/ch/asynk/tankontank/game/hud/Engagement.java b/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java index 217c175..6da7406 100644 --- a/core/src/ch/asynk/tankontank/game/hud/Engagement.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; +import ch.asynk.tankontank.game.Map.Engagement; import ch.asynk.tankontank.game.Army; import ch.asynk.tankontank.engine.gfx.Animation; import ch.asynk.tankontank.engine.gfx.animations.DiceAnimation; @@ -15,7 +15,7 @@ import ch.asynk.tankontank.ui.Label; import ch.asynk.tankontank.ui.Patch; import ch.asynk.tankontank.ui.Position; -public class Engagement extends Patch implements Animation +public class EngagementPanel extends Patch implements Animation { private enum State { ROLL1, MOVE, ROLL2, RESULT }; @@ -44,7 +44,7 @@ public class Engagement extends Patch implements Animation private DiceAnimation d3Animation; private DiceAnimation d4Animation; - public Engagement(BitmapFont font, TextureAtlas uiAtlas, TextureAtlas hudAtlas) + public EngagementPanel(BitmapFont font, TextureAtlas uiAtlas, TextureAtlas hudAtlas) { super(uiAtlas.createPatch("typewriter")); usFlag = new Sprite(hudAtlas.findRegion("us-flag")); @@ -83,7 +83,7 @@ public class Engagement extends Patch implements Animation d4Animation.translate(dx, dy); } - public void show(Map.Engagement e, Position position, float volume) + public void show(Engagement e, Position position, float volume) { DiceAnimation.initSound(volume); attack.write(String.format(" + %d + %d =", e.unitCount, e.flankBonus)); |