Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Audio renaming (still need to find sound effect audio)

Browse source 
Identified the probable cause of the display thread death HDToolKit.bufferSwap. There's an error that gets thrown when the user exits the client without going through the proper way to do so which is unacceptable. A band-aid has been applied.
This commit is contained in:
Woah 2021-03-25 18:08:27 -04:00
parent 8949233eae
commit d821ac7197
69 changed files with 1003 additions and 1007 deletions
Download patch file Download diff file Expand all files Collapse all files

135
Client/src/main/java/org/runite/client/AudioHandler.java
View file

@ -1,19 +1,29 @@
package org.runite.client;
import java.util.Objects;
public final class AudioHandler {
static int currentSoundEffectCount = 0;
public static int[] anIntArray2157 = new int[50];
public static int musicVolume = 255;
static int currentSoundEffectCount = 0;
static int soundEffectVolume = 127;
static int currentTrack = -1;
static boolean musicEffectPlaying = false;
static int[] soundEffectVolumeArray = new int[50];
static int[] soundEffectIDs = new int[50];
static SynthSound[] soundEffects = new SynthSound[50];
static int[] soundEffectCoordinates = new int[50];
public static void musicHandler(int var1) {
public static void musicHandler(int var1) {
try {
if (-1 == var1 && !Class83.aBoolean1158) {
if (-1 == var1 && !musicEffectPlaying) {
GameObject.method1870();
} else if (var1 != -1 && (Class129.anInt1691 != var1 || Class79.method1391(-1)) && Unsorted.anInt120 != 0 && !Class83.aBoolean1158) {
Unsorted.method2099(var1, CacheIndex.musicIndex, Unsorted.anInt120);
} else if (var1 != -1 && (currentTrack != var1 || Class79.method1391(-1)) && musicVolume != 0 && !musicEffectPlaying) {
method2099(var1, CacheIndex.musicIndex, musicVolume);
}
Class129.anInt1691 = var1;
currentTrack = var1;
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "li.B(" + true + ',' + var1 + ')');
}
@ -22,11 +32,11 @@ public final class AudioHandler {
static void soundEffectHandler(int soundEffectID, int soundEffectDelay, int soundEffectVolume) {
try {
if(soundEffectVolume != 0 && soundEffectID != 0 && currentSoundEffectCount < 50 && soundEffectDelay != -1) {
Class166.anIntArray2068[currentSoundEffectCount] = soundEffectID;
Class3_Sub25.anIntArray2550[currentSoundEffectCount] = soundEffectDelay;
Unsorted.anIntArray2157[currentSoundEffectCount] = soundEffectVolume;
Class102.aClass135Array2131[currentSoundEffectCount] = null;
Class3_Sub8.anIntArray3083[currentSoundEffectCount] = 0;
soundEffectVolumeArray[currentSoundEffectCount] = soundEffectID;
soundEffectIDs[currentSoundEffectCount] = soundEffectDelay;
anIntArray2157[currentSoundEffectCount] = soundEffectVolume;
soundEffects[currentSoundEffectCount] = null;
soundEffectCoordinates[currentSoundEffectCount] = 0;
currentSoundEffectCount++;
}
@ -34,4 +44,107 @@ public final class AudioHandler {
throw ClientErrorException.clientError(var5, "ca.C(" + soundEffectID + ',' + soundEffectDelay + ',' + soundEffectVolume + ',' + -799 + ')');
}
}
static void method132() {
try {
for(int var1 = 0; var1 < currentSoundEffectCount; ++var1) {
--anIntArray2157[var1];
if(anIntArray2157[var1] < -10) {
--currentSoundEffectCount;
for(int var2 = var1; var2 < currentSoundEffectCount; ++var2) {
soundEffectIDs[var2] = soundEffectIDs[var2 + 1];
soundEffects[var2] = soundEffects[var2 + 1];
soundEffectVolumeArray[var2] = soundEffectVolumeArray[1 + var2];
anIntArray2157[var2] = anIntArray2157[1 + var2];
soundEffectCoordinates[var2] = soundEffectCoordinates[var2 + 1];
}
--var1;
} else {
SynthSound var11 = soundEffects[var1];
if(null == var11) {
var11 = SynthSound.create(CacheIndex.soundFXIndex, soundEffectIDs[var1], 0);
if(null == var11) {
continue;
}
anIntArray2157[var1] += var11.getStart();
soundEffects[var1] = var11;
}
if(0 > anIntArray2157[var1]) {
int var3;
if(soundEffectCoordinates[var1] == 0) {
var3 = soundEffectVolume;
} else {
int var4 = (soundEffectCoordinates[var1] & 0xFF) * 128;
int var7 = soundEffectCoordinates[var1] >> 8 & 0xFF;
int var5 = soundEffectCoordinates[var1] >> 16 & 0xFF;
int var8 = -Class102.player.zAxis + 64 + 128 * var7;
if(var8 < 0) {
var8 = -var8;
}
int var6 = -Class102.player.xAxis + 64 + var5 * 128;
if(0 > var6) {
var6 = -var6;
}
int var9 = -128 + var6 + var8;
if(var9 > var4) {
anIntArray2157[var1] = -100;
continue;
}
if(var9 < 0) {
var9 = 0;
}
var3 = Sprites.ambientVolume * (var4 + -var9) / var4;
}
if(var3 > 0) {
PcmSound var12 = var11.toPCMSound().method151(Class27.resampler);
Class3_Sub24_Sub1 var13 = Class3_Sub24_Sub1.method437(var12, var3);
Objects.requireNonNull(var13).method429(soundEffectVolumeArray[var1] - 1);
Class3_Sub26.aClass3_Sub24_Sub2_2563.method457(var13);
}
anIntArray2157[var1] = -100;
}
}
}
if(musicEffectPlaying && Class79.method1391(-1)) {
if(0 != musicVolume && currentTrack != -1) {
Class70.method1285(CacheIndex.musicIndex, currentTrack, musicVolume);
}
musicEffectPlaying = false;
} else if(musicVolume != 0 && currentTrack != -1 && Class79.method1391((byte) -92 + 91)) {
TextureOperation12.outgoingBuffer.putOpcode(137);
TextureOperation12.outgoingBuffer.writeInt(currentTrack);
currentTrack = -1;
}
} catch (RuntimeException var10) {
throw ClientErrorException.clientError(var10, "ed.C(" + (byte) -92 + ')');
}
}
public static void method2099(int var1, CacheIndex var3, int var5) {
try {
Class101.aClass153_1423 = var3;
Class132.anInt1741 = 0;
TextureOperation8.anInt3463 = var1;
Unsorted.aBoolean2311 = false;
Unsorted.anInt154 = 1;
GraphicDefinition.anInt546 = 2;
TextureOperation36.anInt3423 = var5;
} catch (RuntimeException var8) {
throw ClientErrorException.clientError(var8, "v.Q(" + true + ',' + var1 + ',' + 0 + ',' + (var3 != null ? "{...}" : "null") + ',' + false + ',' + var5 + ',' + 2 + ')');
}
}
}