summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-18 15:12:51 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-18 15:12:51 +0100
commitedd541044229983e690a09ae26f76f858cc41145 (patch)
tree12c29a74a2b685c6cdd28fb401c38061dd6eb3ce
parenta63bce0fd3f343a51a06a7f41997536b1cd8f974 (diff)
downloadRustAndDust-edd541044229983e690a09ae26f76f858cc41145.zip
RustAndDust-edd541044229983e690a09ae26f76f858cc41145.tar.gz
Hud: code reorder
-rw-r--r--core/src/ch/asynk/rustanddust/game/Hud.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java
index d9aec5c..7a1e2ad 100644
--- a/core/src/ch/asynk/rustanddust/game/Hud.java
+++ b/core/src/ch/asynk/rustanddust/game/Hud.java
@@ -66,8 +66,8 @@ public class Hud implements Disposable, Animation
actionButtons = new ActionButtons(game);
actionButtons.hide();
msg = new Msg(game.font, game.ninePatch, 20f);
- optionsBtn = new Bg(game.factory.getHudRegion(game.factory.ACT_OPTIONS));
okCancel = new OkCancel(game.font, game.ninePatch, game.factory.getHudRegion(game.factory.ACT_DONE), game.factory.getHudRegion(game.factory.ACT_ABORT));
+ optionsBtn = new Bg(game.factory.getHudRegion(game.factory.ACT_OPTIONS));
stats = new StatisticsPanel(game);
engagement = new EngagementPanel(game);
}
@@ -78,10 +78,10 @@ public class Hud implements Disposable, Animation
playerInfo.dispose();
actionButtons.dispose();
msg.dispose();
- optionsBtn.dispose();
okCancel.dispose();
- engagement.dispose();
+ optionsBtn.dispose();
stats.dispose();
+ engagement.dispose();
}
public void resize(int left, int bottom, int width, int height)
@@ -90,10 +90,10 @@ public class Hud implements Disposable, Animation
playerInfo.updatePosition();
actionButtons.updatePosition();
msg.updatePosition();
+ okCancel.updatePosition();
optionsBtn.setPosition(ctrl.battle.getHudPosition().verticalMirror().horizontalMirror());
stats.updatePosition();
engagement.updatePosition();
- okCancel.updatePosition();
}
public void update()
@@ -132,10 +132,10 @@ public class Hud implements Disposable, Animation
playerInfo.draw(batch);
actionButtons.draw(batch);
msg.draw(batch);
- optionsBtn.draw(batch);
okCancel.draw(batch);
- engagement.draw(batch);
+ optionsBtn.draw(batch);
stats.draw(batch);
+ engagement.draw(batch);
}
@Override
@@ -144,10 +144,10 @@ public class Hud implements Disposable, Animation
playerInfo.drawDebug(debugShapes);
actionButtons.drawDebug(debugShapes);
msg.drawDebug(debugShapes);
- optionsBtn.drawDebug(debugShapes);
okCancel.drawDebug(debugShapes);
- engagement.drawDebug(debugShapes);
+ optionsBtn.drawDebug(debugShapes);
stats.drawDebug(debugShapes);
+ engagement.drawDebug(debugShapes);
}
public void pushNotify(String s)