From 7da8beb96a470d919ccf4eee1311ac1958234689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 22 Feb 2016 06:45:31 +0100 Subject: add type.mp3 and enter.mp3 --- android/assets/sounds/enter.mp3 | Bin 0 -> 17170 bytes android/assets/sounds/type.mp3 | Bin 0 -> 16076 bytes assets/sounds/enter.mp3 | Bin 0 -> 17170 bytes assets/sounds/type.mp3 | Bin 0 -> 16076 bytes core/src/ch/asynk/rustanddust/RustAndDust.java | 10 ++++++++++ 5 files changed, 10 insertions(+) create mode 100644 android/assets/sounds/enter.mp3 create mode 100644 android/assets/sounds/type.mp3 create mode 100644 assets/sounds/enter.mp3 create mode 100644 assets/sounds/type.mp3 diff --git a/android/assets/sounds/enter.mp3 b/android/assets/sounds/enter.mp3 new file mode 100644 index 0000000..3d720cb Binary files /dev/null and b/android/assets/sounds/enter.mp3 differ diff --git a/android/assets/sounds/type.mp3 b/android/assets/sounds/type.mp3 new file mode 100644 index 0000000..b9c83d9 Binary files /dev/null and b/android/assets/sounds/type.mp3 differ diff --git a/assets/sounds/enter.mp3 b/assets/sounds/enter.mp3 new file mode 100644 index 0000000..3d720cb Binary files /dev/null and b/assets/sounds/enter.mp3 differ diff --git a/assets/sounds/type.mp3 b/assets/sounds/type.mp3 new file mode 100644 index 0000000..b9c83d9 Binary files /dev/null and b/assets/sounds/type.mp3 differ diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java index ac6e4eb..d11f828 100644 --- a/core/src/ch/asynk/rustanddust/RustAndDust.java +++ b/core/src/ch/asynk/rustanddust/RustAndDust.java @@ -47,6 +47,8 @@ public class RustAndDust extends Game public static final String SND_EXPLOSION_SHORT = "sounds/explosion_short.mp3"; public static final String SND_PROMOTE_US = "sounds/promote_us.mp3"; public static final String SND_PROMOTE_GE = "sounds/promote_ge.mp3"; + public static final String SND_TYPE = "sounds/type.mp3"; + public static final String SND_ENTER = "sounds/enter.mp3"; public static final String UI_OK = "ok"; public static final String UI_CANCEL = "cancel"; @@ -74,6 +76,8 @@ public class RustAndDust extends Game public BitmapFont font; public NinePatch bgPatch; public NinePatch framePatch; + public Sound typeSnd; + public Sound enterSnd; public enum State { @@ -126,6 +130,8 @@ public class RustAndDust extends Game state = State.NONE; loadUiAssets(); + typeSnd = manager.get(SND_TYPE, Sound.class); + enterSnd = manager.get(SND_ENTER, Sound.class); switchToMenu(); } @@ -207,6 +213,8 @@ public class RustAndDust extends Game private void loadUiAssets() { + manager.load(SND_TYPE, Sound.class); + manager.load(SND_ENTER, Sound.class); manager.load(ATLAS_UI, TextureAtlas.class); manager.finishLoading(); uiAtlas = manager.get(ATLAS_UI, TextureAtlas.class); @@ -226,6 +234,8 @@ public class RustAndDust extends Game { font.dispose(); manager.unload(ATLAS_UI); + manager.unload(SND_TYPE); + manager.unload(SND_ENTER); } private void loadMenuAssets() -- cgit v1.1-2-g2b99