sen/tcr
sen/tcr
1
0
Fork 0
Code Activity

fix bank loader (DMX), add new press sound

Browse source
This commit is contained in:
Sen 2025-09-03 11:56:19 +02:00
parent ceda16246c
commit 9683b18337
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
5 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/main/java/client/Client.java
View file

@ -2878,7 +2878,7 @@ public class Client implements IThreadListener {
if(func != null) { if(func != null) {
Bind.disableInput(key); Bind.disableInput(key);
if(!(this.open instanceof GuiLoading)) { 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); func.runner.execute(key);
} }
} }

2
client/src/main/java/client/audio/BankLoader.java
View file

@ -120,7 +120,7 @@ typedef struct {
int[] fb = new int[2]; int[] fb = new int[2];
int algo = op2x2 ? 0x08 : 0x00; int algo = op2x2 ? 0x08 : 0x00;
for(int ch = 0; ch < (op2x2 ? 2 : 1); ch++) { 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++) { for(int op = 0; op < 2; op++) {
boolean tremolo = (data[offset + op*7+0] & 0x80) != 0; boolean tremolo = (data[offset + op*7+0] & 0x80) != 0;
boolean vibrato = (data[offset + op*7+0] & 0x40) != 0; boolean vibrato = (data[offset + op*7+0] & 0x40) != 0;

2
client/src/main/java/client/gui/element/Element.java
View file

@ -267,6 +267,6 @@ public abstract class Element {
} }
public void playSound() { 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));
} }
} }

BIN
client/src/main/resources/sounds/press.ogg Normal file
View file

Binary file not shown.

2
common/src/main/java/common/init/SoundEvent.java
View file

@ -1,6 +1,8 @@
package common.init; package common.init;
public enum SoundEvent { public enum SoundEvent {
PRESS("press"),
CLOTH("cloth1", "cloth2", "cloth3", "cloth4"), CLOTH("cloth1", "cloth2", "cloth3", "cloth4"),
GRASS("grass1", "grass2", "grass3", "grass4"), GRASS("grass1", "grass2", "grass3", "grass4"),
GRAVEL("gravel1", "gravel2", "gravel3", "gravel4"), GRAVEL("gravel1", "gravel2", "gravel3", "gravel4"),