mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-03-06 07:30:41 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed read*BitsOrLess and replaced with casted readUnsigned

Browse Source
This commit is contained in:
Collin Smith 2020-07-28 04:54:28 -07:00
parent 940addbca1
commit 5f2c2ca999
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/com/riiablo/codec/util/BitStream.java
View File

@ -155,21 +155,6 @@ public class BitStream {
return (int) readUnsigned(bits);
}
public short read16BitsOrLess(int bits) {
assert bits <= Short.SIZE;
return (short) readUnsigned(bits);
}
public int read32BitsOrLess(int bits) {
assert bits <= Integer.SIZE;
return (int) readUnsigned(bits);
}
public long read64BitsOrLess(int bits) {
assert bits <= Long.SIZE;
return readUnsigned(bits);
}
public int readSigned(int bits) {
int shift = Integer.SIZE - bits;
return ((int) readUnsigned(bits)) << shift >> shift;

6
core/src/com/riiablo/item/ItemSerializer.java
View File

@ -15,7 +15,7 @@ public class ItemSerializer {
public Item read(BitStream bitStream) {
Item item = new Item();
item.reset();
item.flags = bitStream.read32BitsOrLess(Integer.SIZE);
item.flags = (int) bitStream.readUnsigned(Integer.SIZE);
item.version = bitStream.readUnsigned8OrLess(Byte.SIZE);
bitStream.skip(2); // Unknown use -- safe to skip
item.location = Location.valueOf(bitStream.readUnsigned7OrLess(3));
@ -54,7 +54,7 @@ public class ItemSerializer {
private static void read(BitStream bitStream, Item item) {
item.data = bitStream.getBufferView(); // TODO: remove when serialization implemented
item.id = bitStream.read32BitsOrLess(Integer.SIZE);
item.id = (int) bitStream.readUnsigned(Integer.SIZE);
item.ilvl = bitStream.readUnsigned7OrLess(7);
item.quality = Quality.valueOf(bitStream.readUnsigned7OrLess(4));
item.pictureId = bitStream.readBoolean() ? bitStream.readUnsigned7OrLess(3) : Item.NO_PICTURE_ID;
@ -134,7 +134,7 @@ public class ItemSerializer {
private static boolean readRunewordData(BitStream bitStream, Item item) {
boolean hasRunewordData = (item.flags & Item.ITEMFLAG_RUNEWORD) == Item.ITEMFLAG_RUNEWORD;
item.runewordData = hasRunewordData ? bitStream.read16BitsOrLess(Short.SIZE) : 0;
item.runewordData = hasRunewordData ? (short) bitStream.readUnsigned(Short.SIZE) : 0;
return hasRunewordData;
}