Renamed midi/sound functions

This commit is contained in:
Pazaz 2022-06-27 13:08:03 -04:00
parent 2b59a97e7a
commit 9789c5b66e
30 changed files with 1096 additions and 1099 deletions

View file

@ -13,7 +13,7 @@ public class MusicPlayer {
public static void playSong(@OriginalArg(1) int arg0) {
if (arg0 == -1 && !MidiPlayer.jingle) {
MidiPlayer.method4548();
} else if (arg0 != -1 && (groupId != arg0 || !MidiPlayer.method2655()) && Preferences.musicVolume != 0 && !MidiPlayer.jingle) {
} else if (arg0 != -1 && (groupId != arg0 || !MidiPlayer.isPlaying()) && Preferences.musicVolume != 0 && !MidiPlayer.jingle) {
MidiPlayer.playFadeOut(arg0, client.js5Archive6, Preferences.musicVolume);
}
groupId = arg0;
@ -22,7 +22,7 @@ public class MusicPlayer {
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIB)V")
public static void playJingle(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
if (Preferences.musicVolume != 0 && arg1 != -1) {
MidiPlayer.method2410(client.js5Archive11, arg1, Preferences.musicVolume);
MidiPlayer.playImmediate(client.js5Archive11, arg1, Preferences.musicVolume);
MidiPlayer.jingle = true;
}
}