upstream: merge
upstream: merge
This commit is contained in:
@@ -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
|
||||
};
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user