diff options
| -rw-r--r-- | android/assets/data/hud.atlas | 14 | ||||
| -rw-r--r-- | android/assets/data/hud.png | bin | 83632 -> 98229 bytes | |||
| -rw-r--r-- | assets/hud/cancel.png | bin | 0 -> 6121 bytes | |||
| -rw-r--r-- | assets/hud/ok.png | bin | 0 -> 6173 bytes | |||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java | 4 |
5 files changed, 16 insertions, 2 deletions
diff --git a/android/assets/data/hud.atlas b/android/assets/data/hud.atlas index 06f6b0d..2ee788a 100644 --- a/android/assets/data/hud.atlas +++ b/android/assets/data/hud.atlas @@ -18,6 +18,13 @@ attack orig: 24, 24 offset: 0, 0 index: -1 +cancel + rotate: false + xy: 180, 157 + size: 48, 47 + orig: 48, 47 + offset: 0, 0 + index: -1 defense rotate: false xy: 94, 2 @@ -32,6 +39,13 @@ ge-flag orig: 80, 48 offset: 0, 0 index: -1 +ok + rotate: false + xy: 138, 107 + size: 48, 47 + orig: 48, 47 + offset: 0, 0 + index: -1 promote rotate: false xy: 88, 78 diff --git a/android/assets/data/hud.png b/android/assets/data/hud.png Binary files differindex d34c1d7..3bfb0b4 100644 --- a/android/assets/data/hud.png +++ b/android/assets/data/hud.png diff --git a/assets/hud/cancel.png b/assets/hud/cancel.png Binary files differnew file mode 100644 index 0000000..e2c5894 --- /dev/null +++ b/assets/hud/cancel.png diff --git a/assets/hud/ok.png b/assets/hud/ok.png Binary files differnew file mode 100644 index 0000000..9e7a47b --- /dev/null +++ b/assets/hud/ok.png diff --git a/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java index 323767f..05753b8 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java +++ b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java @@ -49,8 +49,8 @@ public class ActionButtons extends Widget this.buttons = new Bg[Buttons.LAST.i]; - this.buttons[Buttons.DONE.i] = new Bg(uiAtlas.findRegion("ok")); - this.buttons[Buttons.ABORT.i] = new Bg(uiAtlas.findRegion("cancel")); + this.buttons[Buttons.DONE.i] = new Bg(hudAtlas.findRegion("ok")); + this.buttons[Buttons.ABORT.i] = new Bg(hudAtlas.findRegion("cancel")); this.buttons[Buttons.PROMOTE.i] = new Bg(hudAtlas.findRegion("promote")); this.states = new StateType[Buttons.LAST.i]; |
