diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index 615adb77..d54766e2 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -2878,7 +2878,7 @@ public class Client implements IThreadListener { if(func != null) { Bind.disableInput(key); if(!(this.open instanceof GuiLoading)) { - this.soundManager.playSound(new PositionedSound(SoundEvent.CLICK, EventType.UI_INTERFACE)); + this.soundManager.playSound(new PositionedSound(SoundEvent.PRESS, EventType.UI_INTERFACE)); func.runner.execute(key); } } diff --git a/client/src/main/java/client/audio/BankLoader.java b/client/src/main/java/client/audio/BankLoader.java index c2b4f74e..063cdc03 100644 --- a/client/src/main/java/client/audio/BankLoader.java +++ b/client/src/main/java/client/audio/BankLoader.java @@ -120,7 +120,7 @@ typedef struct { int[] fb = new int[2]; int algo = op2x2 ? 0x08 : 0x00; for(int ch = 0; ch < (op2x2 ? 2 : 1); ch++) { - int transpose = (int)dmx_read_uint16(data, offset + 14) + 12; + int transpose = (int)((short)dmx_read_uint16(data, offset + 14)) + 12; for(int op = 0; op < 2; op++) { boolean tremolo = (data[offset + op*7+0] & 0x80) != 0; boolean vibrato = (data[offset + op*7+0] & 0x40) != 0; diff --git a/client/src/main/java/client/gui/element/Element.java b/client/src/main/java/client/gui/element/Element.java index dd9267ca..cac26d9f 100644 --- a/client/src/main/java/client/gui/element/Element.java +++ b/client/src/main/java/client/gui/element/Element.java @@ -267,6 +267,6 @@ public abstract class Element { } public void playSound() { - this.gm.getSoundManager().playSound(new PositionedSound(SoundEvent.CLICK, EventType.UI_INTERFACE)); + this.gm.getSoundManager().playSound(new PositionedSound(SoundEvent.PRESS, EventType.UI_INTERFACE)); } } diff --git a/client/src/main/resources/sounds/press.ogg b/client/src/main/resources/sounds/press.ogg new file mode 100644 index 00000000..84aaf466 Binary files /dev/null and b/client/src/main/resources/sounds/press.ogg differ diff --git a/common/src/main/java/common/init/SoundEvent.java b/common/src/main/java/common/init/SoundEvent.java index 6fcd8559..db43a2a2 100755 --- a/common/src/main/java/common/init/SoundEvent.java +++ b/common/src/main/java/common/init/SoundEvent.java @@ -1,6 +1,8 @@ package common.init; public enum SoundEvent { + PRESS("press"), + CLOTH("cloth1", "cloth2", "cloth3", "cloth4"), GRASS("grass1", "grass2", "grass3", "grass4"), GRAVEL("gravel1", "gravel2", "gravel3", "gravel4"),