summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-22 06:45:31 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-22 06:45:31 +0100
commit7da8beb96a470d919ccf4eee1311ac1958234689 (patch)
tree7cd817f907d68a380e654c7530b80bdf695f1b73
parenta64556c077d4fdee8b0005582b0493dc1b23087d (diff)
downloadRustAndDust-7da8beb96a470d919ccf4eee1311ac1958234689.zip
RustAndDust-7da8beb96a470d919ccf4eee1311ac1958234689.tar.gz
add type.mp3 and enter.mp3
-rw-r--r--android/assets/sounds/enter.mp3bin0 -> 17170 bytes
-rw-r--r--android/assets/sounds/type.mp3bin0 -> 16076 bytes
-rw-r--r--assets/sounds/enter.mp3bin0 -> 17170 bytes
-rw-r--r--assets/sounds/type.mp3bin0 -> 16076 bytes
-rw-r--r--core/src/ch/asynk/rustanddust/RustAndDust.java10
5 files changed, 10 insertions, 0 deletions
diff --git a/android/assets/sounds/enter.mp3 b/android/assets/sounds/enter.mp3
new file mode 100644
index 0000000..3d720cb
--- /dev/null
+++ b/android/assets/sounds/enter.mp3
Binary files differ
diff --git a/android/assets/sounds/type.mp3 b/android/assets/sounds/type.mp3
new file mode 100644
index 0000000..b9c83d9
--- /dev/null
+++ b/android/assets/sounds/type.mp3
Binary files differ
diff --git a/assets/sounds/enter.mp3 b/assets/sounds/enter.mp3
new file mode 100644
index 0000000..3d720cb
--- /dev/null
+++ b/assets/sounds/enter.mp3
Binary files differ
diff --git a/assets/sounds/type.mp3 b/assets/sounds/type.mp3
new file mode 100644
index 0000000..b9c83d9
--- /dev/null
+++ b/assets/sounds/type.mp3
Binary files 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()