From 734c79b736a177b4f4418ad360d57a0e004a7f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Fri, 14 Nov 2014 12:31:57 +0100
Subject: btn-attack -> btn-engage

---
 android/assets/data/hud.atlas                      |  18 +++++++++---------
 android/assets/data/hud.png                        | Bin 343848 -> 344470 bytes
 .../asynk/tankontank/game/hud/ActionButtons.java   |   2 +-
 data/assets/hud/btn-attack-down.png                | Bin 2134 -> 0 bytes
 data/assets/hud/btn-attack-on.png                  | Bin 5370 -> 0 bytes
 data/assets/hud/btn-attack-up.png                  | Bin 8509 -> 0 bytes
 data/assets/hud/btn-engage-down.png                | Bin 0 -> 2134 bytes
 data/assets/hud/btn-engage-on.png                  | Bin 0 -> 5370 bytes
 data/assets/hud/btn-engage-up.png                  | Bin 0 -> 8509 bytes
 9 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 data/assets/hud/btn-attack-down.png
 delete mode 100644 data/assets/hud/btn-attack-on.png
 delete mode 100644 data/assets/hud/btn-attack-up.png
 create mode 100644 data/assets/hud/btn-engage-down.png
 create mode 100644 data/assets/hud/btn-engage-on.png
 create mode 100644 data/assets/hud/btn-engage-up.png

diff --git a/android/assets/data/hud.atlas b/android/assets/data/hud.atlas
index f137d02..73099b6 100644
--- a/android/assets/data/hud.atlas
+++ b/android/assets/data/hud.atlas
@@ -31,63 +31,63 @@ back
   orig: 124, 124
   offset: 0, 0
   index: -1
-btn-attack-down
+btn-cancel-down
   rotate: false
   xy: 716, 194
   size: 60, 60
   orig: 60, 60
   offset: 0, 0
   index: -1
-btn-attack-on
+btn-cancel-on
   rotate: false
   xy: 778, 194
   size: 60, 60
   orig: 60, 60
   offset: 0, 0
   index: -1
-btn-attack-up
+btn-cancel-up
   rotate: false
   xy: 840, 194
   size: 60, 60
   orig: 60, 60
   offset: 0, 0
   index: -1
-btn-cancel-down
+btn-check-down
   rotate: false
   xy: 902, 194
   size: 60, 60
   orig: 60, 60
   offset: 0, 0
   index: -1
-btn-cancel-on
+btn-check-on
   rotate: false
   xy: 254, 68
   size: 60, 60
   orig: 60, 60
   offset: 0, 0
   index: -1
-btn-cancel-up
+btn-check-up
   rotate: false
   xy: 254, 6
   size: 60, 60
   orig: 60, 60
   offset: 0, 0
   index: -1
-btn-check-down
+btn-engage-down
   rotate: false
   xy: 316, 68
   size: 60, 60
   orig: 60, 60
   offset: 0, 0
   index: -1
-btn-check-on
+btn-engage-on
   rotate: false
   xy: 316, 6
   size: 60, 60
   orig: 60, 60
   offset: 0, 0
   index: -1
-btn-check-up
+btn-engage-up
   rotate: false
   xy: 378, 68
   size: 60, 60
diff --git a/android/assets/data/hud.png b/android/assets/data/hud.png
index 35f27e7..3e755af 100644
Binary files a/android/assets/data/hud.png and b/android/assets/data/hud.png differ
diff --git a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java b/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java
index d936996..b3a9afe 100644
--- a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java
+++ b/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java
@@ -51,7 +51,7 @@ public class ActionButtons extends Bg
         this.buttons[Buttons.MOVE.i] = new Button(atlas, "btn-move");
         this.buttons[Buttons.ROTATE.i] = new Button(atlas, "btn-rotate");
         this.buttons[Buttons.PROMOTE.i] = new Button(atlas, "btn-promote");
-        this.buttons[Buttons.ENGAGE.i] = new Button(atlas, "btn-attack");
+        this.buttons[Buttons.ENGAGE.i] = new Button(atlas, "btn-engage");
         this.buttons[Buttons.DONE.i] = new Button(atlas, "btn-check");
         this.buttons[Buttons.ABORT.i] = new Button(atlas, "btn-cancel");
 
diff --git a/data/assets/hud/btn-attack-down.png b/data/assets/hud/btn-attack-down.png
deleted file mode 100644
index 2298474..0000000
Binary files a/data/assets/hud/btn-attack-down.png and /dev/null differ
diff --git a/data/assets/hud/btn-attack-on.png b/data/assets/hud/btn-attack-on.png
deleted file mode 100644
index 55d2d16..0000000
Binary files a/data/assets/hud/btn-attack-on.png and /dev/null differ
diff --git a/data/assets/hud/btn-attack-up.png b/data/assets/hud/btn-attack-up.png
deleted file mode 100644
index 5a29edc..0000000
Binary files a/data/assets/hud/btn-attack-up.png and /dev/null differ
diff --git a/data/assets/hud/btn-engage-down.png b/data/assets/hud/btn-engage-down.png
new file mode 100644
index 0000000..2298474
Binary files /dev/null and b/data/assets/hud/btn-engage-down.png differ
diff --git a/data/assets/hud/btn-engage-on.png b/data/assets/hud/btn-engage-on.png
new file mode 100644
index 0000000..55d2d16
Binary files /dev/null and b/data/assets/hud/btn-engage-on.png differ
diff --git a/data/assets/hud/btn-engage-up.png b/data/assets/hud/btn-engage-up.png
new file mode 100644
index 0000000..5a29edc
Binary files /dev/null and b/data/assets/hud/btn-engage-up.png differ
-- 
cgit v1.1-2-g2b99