2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2026-08-21 02:15:14 -06:00
Code Issues Projects Releases Packages Wiki Activity

Refactored some anim/area sound classes

Browse source
This commit is contained in:
Pazaz 2022-04-28 02:35:11 -04:00
parent dbca509eb5
commit fd3572f709
108 changed files with 1063 additions and 1078 deletions
Download patch file Download diff file Expand all files Collapse all files

63
client/src/main/java/rt4/Static150.java
View file

@ -72,67 +72,4 @@ public final class Static150 {
}
}
@OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!fl;IIII)V")
public static void method2804(@OriginalArg(0) int arg0, @OriginalArg(1) AreaSound arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg1.sound == -1 && arg1.sounds == null) {
return;
}
@Pc(20) int local20 = 0;
if (arg1.anInt2037 < arg0) {
local20 = arg0 - arg1.anInt2037;
} else if (arg1.anInt2041 > arg0) {
local20 = arg1.anInt2041 - arg0;
}
if (arg1.anInt2028 < arg4) {
local20 += arg4 - arg1.anInt2028;
} else if (arg4 < arg1.anInt2029) {
local20 += arg1.anInt2029 - arg4;
}
if (arg1.radius == 0 || arg1.radius < local20 - 64 || Preferences.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) {
if (arg1.primaryStream != null) {
client.soundStream.removeSubStream(arg1.primaryStream);
arg1.primaryStream = null;
}
if (arg1.secondaryStream != null) {
client.soundStream.removeSubStream(arg1.secondaryStream);
arg1.secondaryStream = null;
}
return;
}
local20 -= 64;
if (local20 < 0) {
local20 = 0;
}
@Pc(134) int local134 = (arg1.radius - local20) * Preferences.ambientSoundsVolume / arg1.radius;
if (arg1.primaryStream != null) {
arg1.primaryStream.method386(local134);
} else if (arg1.sound >= 0) {
@Pc(150) SynthSound local150 = SynthSound.create(client.js5Archive4, arg1.sound, 0);
if (local150 != null) {
@Pc(158) PcmSound local158 = local150.method3989().method2648(client.resampler);
@Pc(163) SoundPcmStream local163 = Static284.method404(local158, local134);
local163.method396(-1);
client.soundStream.method1343(local163);
arg1.primaryStream = local163;
}
}
if (arg1.secondaryStream != null) {
arg1.secondaryStream.method386(local134);
if (!arg1.secondaryStream.method4654()) {
arg1.secondaryStream = null;
}
} else if (arg1.sounds != null && (arg1.anInt2034 -= arg3) <= 0) {
@Pc(219) int local219 = (int) ((double) arg1.sounds.length * Math.random());
@Pc(227) SynthSound local227 = SynthSound.create(client.js5Archive4, arg1.sounds[local219], 0);
if (local227 != null) {
@Pc(236) PcmSound local236 = local227.method3989().method2648(client.resampler);
@Pc(241) SoundPcmStream local241 = Static284.method404(local236, local134);
local241.method396(0);
client.soundStream.method1343(local241);
arg1.anInt2034 = (int) ((double) (arg1.anInt2040 - arg1.anInt2032) * Math.random()) + arg1.anInt2032;
arg1.secondaryStream = local241;
}
}
}
}