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

Merge pull request #2014 from Abextm/object-varname

Browse Source 
cache: Name ObjectDefiniton's varpID and configID correctly
This commit is contained in:
Adam
2018-04-27 08:23:00 -04:00
committed by GitHub
parent 9bbe4c72ff 30e70bb9d1
commit e3de89e670
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ public class ObjectDefinition
private boolean nonFlatShading = false; private boolean nonFlatShading = false;
private int anInt2088 = -1; private int anInt2088 = -1;
private int animationID = -1; private int animationID = -1;
private int varpID = -1; private int varbitID = -1;
private int ambient = 0; private int ambient = 0;
private int contrast = 0; private int contrast = 0;
private String[] actions = new String[5]; private String[] actions = new String[5];
@@ -68,7 +68,7 @@ public class ObjectDefinition
private int anInt2106 = -1; private int anInt2106 = -1;
private int[] configChangeDest; private int[] configChangeDest;
private boolean isRotated = false; private boolean isRotated = false;
private int configId = -1; private int varpID = -1;
private int anInt2110 = -1; private int anInt2110 = -1;
private boolean aBool2111 = false; private boolean aBool2111 = false;
private int anInt2112 = 0; private int anInt2112 = 0;

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

@@ -253,14 +253,14 @@ public class ObjectLoader
{ {
varpID = -1; varpID = -1;
} }
def.setVarpID(varpID); def.setVarbitID(varpID);
int configId = is.readUnsignedShort(); int configId = is.readUnsignedShort();
if (configId == 0xFFFF) if (configId == 0xFFFF)
{ {
configId = -1; configId = -1;
} }
def.setConfigId(configId); def.setVarpID(configId);
int length = is.readUnsignedByte(); int length = is.readUnsignedByte();
int[] configChangeDest = new int[length + 2]; int[] configChangeDest = new int[length + 2];
@@ -313,14 +313,14 @@ public class ObjectLoader
{ {
varpID = -1; varpID = -1;
} }
def.setVarpID(varpID); def.setVarbitID(varpID);
int configId = is.readUnsignedShort(); int configId = is.readUnsignedShort();
if (configId == 0xFFFF) if (configId == 0xFFFF)
{ {
configId = -1; configId = -1;
} }
def.setConfigId(configId); def.setVarpID(configId);
int var = is.readUnsignedShort(); int var = is.readUnsignedShort();

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

@@ -196,8 +196,8 @@ public class ObjectSaver
if (obj.getConfigChangeDest() != null) if (obj.getConfigChangeDest() != null)
{ {
out.writeByte(92); out.writeByte(92);
out.writeShort(obj.getVarbitID());
out.writeShort(obj.getVarpID()); out.writeShort(obj.getVarpID());
out.writeShort(obj.getConfigId());
int[] c = obj.getConfigChangeDest(); int[] c = obj.getConfigChangeDest();
out.writeShort(c[c.length - 1]); out.writeShort(c[c.length - 1]);