upstream: merge

upstream: merge
This commit is contained in:
xKylee
2020-03-01 20:44:44 +00:00
13 changed files with 319 additions and 170 deletions

View File

@@ -35,8 +35,8 @@ public class KitDefinition
public short[] retextureToFind;
public short[] retextureToReplace;
public int bodyPartId = -1;
public int[] modelIds;
public int[] models = new int[]
public int[] models;
public int[] chatheadModels = new int[]
{
-1, -1, -1, -1, -1
};

View File

@@ -53,11 +53,11 @@ public class KitLoader
else if (opcode == 2)
{
int length = is.readUnsignedByte();
def.modelIds = new int[length];
def.models = new int[length];
for (int index = 0; index < length; ++index)
{
def.modelIds[index] = is.readUnsignedShort();
def.models[index] = is.readUnsignedShort();
}
}
else if (opcode == 3)
@@ -90,7 +90,7 @@ public class KitLoader
}
else if (opcode >= 60 && opcode < 70)
{
def.models[opcode - 60] = is.readShort();
def.chatheadModels[opcode - 60] = is.readUnsignedShort();
}
}