From a4c8b74a2bbcd5cd90d7a104b5876606837b91b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Mon, 14 Dec 2015 11:07:16 +0100
Subject: add hud ok.png and cancel.png

---
 android/assets/data/hud.atlas                       |  14 ++++++++++++++
 android/assets/data/hud.png                         | Bin 83632 -> 98229 bytes
 assets/hud/cancel.png                               | Bin 0 -> 6121 bytes
 assets/hud/ok.png                                   | Bin 0 -> 6173 bytes
 .../asynk/rustanddust/game/hud/ActionButtons.java   |   4 ++--
 5 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 assets/hud/cancel.png
 create mode 100644 assets/hud/ok.png

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
index d34c1d7..3bfb0b4 100644
Binary files a/android/assets/data/hud.png and b/android/assets/data/hud.png differ
diff --git a/assets/hud/cancel.png b/assets/hud/cancel.png
new file mode 100644
index 0000000..e2c5894
Binary files /dev/null and b/assets/hud/cancel.png differ
diff --git a/assets/hud/ok.png b/assets/hud/ok.png
new file mode 100644
index 0000000..9e7a47b
Binary files /dev/null and b/assets/hud/ok.png differ
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];
-- 
cgit v1.1-2-g2b99