ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-11-03 13:15:32 +01:00
parent c3d86d216b 1456e10e66
commit 798b93802b
17 changed files with 313 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java vendored
View File

@@ -44,7 +44,7 @@ public class ObjectDefinition
private int sizeX = 1;
private int sizeY = 1;
private int anInt2083 = 0;
private int[] anIntArray2084;
private int[] ambientSoundIds;
private int offsetX = 0;
private boolean mergeNormals = false;
private int wallOrDoor = -1;

2
cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java vendored
View File

@@ -300,7 +300,7 @@ public class ObjectLoader
anIntArray2084[index] = is.readUnsignedShort();
}
def.setAnIntArray2084(anIntArray2084);
def.setAmbientSoundIds(anIntArray2084);
}
else if (opcode == 81)
{

6
cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java vendored
View File

@@ -176,14 +176,14 @@ public class ObjectSaver
out.writeShort(obj.getAmbientSoundId());
out.writeByte(obj.getAnInt2083());
}
if (obj.getAnIntArray2084() != null)
if (obj.getAmbientSoundIds() != null)
{
out.writeByte(79);
out.writeShort(obj.getAnInt2112());
out.writeShort(obj.getAnInt2113());
out.writeByte(obj.getAnInt2083());
out.writeByte(obj.getAnIntArray2084().length);
for (int i : obj.getAnIntArray2084())
out.writeByte(obj.getAmbientSoundIds().length);
for (int i : obj.getAmbientSoundIds())
{
out.writeShort(i);
}