diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-28 18:32:14 +0100 | 
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-28 18:32:14 +0100 | 
| commit | 930cdbb4735fc6a52cc7b54b658907935675c3d9 (patch) | |
| tree | 51ac4b95d6801872309f94045e9b771ebbdd3497 | |
| parent | 0a980b02634f2a0f6cf25a1ea928ec7877e0ee51 (diff) | |
| download | RustAndDust-930cdbb4735fc6a52cc7b54b658907935675c3d9.zip RustAndDust-930cdbb4735fc6a52cc7b54b658907935675c3d9.tar.gz | |
remove order.png
| -rw-r--r-- | android/assets/data/hud.atlas | 13 | ||||
| -rw-r--r-- | android/assets/data/hud.png | bin | 68927 -> 62389 bytes | |||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/hud/ActionButtons.java | 10 | ||||
| -rw-r--r-- | data/misc/order.png (renamed from data/assets/hud/order.png) | bin | 4687 -> 4687 bytes | 
4 files changed, 6 insertions, 17 deletions
| diff --git a/android/assets/data/hud.atlas b/android/assets/data/hud.atlas index 683a76b..eb3885c 100644 --- a/android/assets/data/hud.atlas +++ b/android/assets/data/hud.atlas @@ -38,23 +38,16 @@ ok    orig: 48, 48    offset: 0, 0    index: -1 -order -  rotate: false -  xy: 180, 130 -  size: 48, 48 -  orig: 48, 48 -  offset: 0, 0 -  index: -1  promote    rotate: false -  xy: 102, 2 +  xy: 180, 130    size: 48, 48    orig: 48, 48    offset: 0, 0    index: -1  reinforcement    rotate: false -  xy: 134, 80 +  xy: 102, 2    size: 48, 48    orig: 48, 48    offset: 0, 0 @@ -68,7 +61,7 @@ reinforcement-selected    index: -1  turns    rotate: false -  xy: 184, 80 +  xy: 134, 80    size: 48, 48    orig: 48, 48    offset: 0, 0 diff --git a/android/assets/data/hud.png b/android/assets/data/hud.pngBinary files differ index 3e66c4a..f3dfe1d 100644 --- a/android/assets/data/hud.png +++ b/android/assets/data/hud.png diff --git a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java b/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java index 90e9873..8c0682c 100644 --- a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java +++ b/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java @@ -15,10 +15,9 @@ public class ActionButtons extends Bg      public enum Buttons {          NONE(-1, 0),          PROMOTE(0, 1), -        ORDER(1, 2), -        DONE(2, 4), -        ABORT(3, 8), -        LAST(4, 0); +        DONE(1, 2), +        ABORT(2, 4), +        LAST(3, 0);          Buttons(int i, int b)          { @@ -49,12 +48,9 @@ public class ActionButtons extends Bg          this.buttons = new Bg[Buttons.LAST.i];          this.buttons[Buttons.DONE.i] = new Bg(atlas.findRegion("ok"));          this.buttons[Buttons.ABORT.i] = new Bg(atlas.findRegion("cancel")); -        this.buttons[Buttons.ORDER.i] = new Bg(atlas.findRegion("order"));          this.buttons[Buttons.PROMOTE.i] = new Bg(atlas.findRegion("promote"));          this.states = new StateType[Buttons.LAST.i]; -        // FIXME -        // this.states[Buttons.ORDER.i] = StateType.ORDER;          this.states[Buttons.PROMOTE.i] = StateType.PROMOTE;          this.states[Buttons.DONE.i] = StateType.DONE;          this.states[Buttons.ABORT.i] = StateType.ABORT; diff --git a/data/assets/hud/order.png b/data/misc/order.pngBinary files differ index b810043..b810043 100644 --- a/data/assets/hud/order.png +++ b/data/misc/order.png | 
