Bitread v0.2.1 (API changes)

Author: markus-wa

Gopkg.lock

@@ -35,7 +35,7 @@
 
 [[constraint]]
   name = "github.com/markus-wa/gobitread"
-  version = "0.1.0"
+  version = "0.2.1"
 
 [[constraint]]
   name = "github.com/markus-wa/godispatch"

Gopkg.toml

@@ -57,7 +57,7 @@ func (p *Parser) handlePacketEntities(pe *msg.CSVCMsg_PacketEntities) {
 }
 
 func (p *Parser) readEnterPVS(reader *bit.BitReader, entityID int) *st.Entity {
-	scID := int(reader.ReadInt(uint(p.stParser.ClassBits())))
+	scID := int(reader.ReadInt(p.stParser.ClassBits()))
 	reader.ReadInt(10) // Serial Number
 
 	newEntity := st.NewEntity(entityID, p.stParser.ServerClasses()[scID])
@@ -563,7 +563,7 @@ func (p *Parser) handleCreateStringTable(tab *msg.CSVCMsg_CreateStringTable) {
 	}
 
 	nTmp := tab.MaxEntries
-	var nEntryBits uint
+	nEntryBits := 0
 
 	for nTmp != 0 {
 		nTmp = nTmp >> 1
@@ -608,7 +608,7 @@ func (p *Parser) handleCreateStringTable(tab *msg.CSVCMsg_CreateStringTable) {
 		if br.ReadBit() {
 			if tab.UserDataFixedSize {
 				// Should always be < 8 bits => use faster ReadBitsToByte() over ReadBits()
-				userdat = []byte{br.ReadBitsToByte(uint(tab.UserDataSizeBits))}
+				userdat = []byte{br.ReadBitsToByte(int(tab.UserDataSizeBits))}
 			} else {
 				userdat = br.ReadBytes(int(br.ReadInt(14)))
 			}

packet_handlers.go

@@ -75,17 +75,17 @@ func (propertyDecoder) decodeInt(prop *sendTableProperty, reader *bit.BitReader)
 		return int(reader.ReadSignedVarInt32())
 	}
 	if prop.flags.hasFlagSet(propFlagUnsigned) {
-		return int(reader.ReadInt(uint(prop.numberOfBits)))
+		return int(reader.ReadInt(prop.numberOfBits))
 	}
-	return reader.ReadSignedInt(uint(prop.numberOfBits))
+	return reader.ReadSignedInt(prop.numberOfBits)
 }
 
 func (propertyDecoder) decodeFloat(prop *sendTableProperty, reader *bit.BitReader) float32 {
 	if prop.flags&specialFloatFlags != 0 {
 		return propDecoder.decodeSpecialFloat(prop, reader)
 	}
 
-	dwInterp := reader.ReadInt(uint(prop.numberOfBits))
+	dwInterp := reader.ReadInt(prop.numberOfBits)
 	return prop.lowValue + ((prop.highValue - prop.lowValue) * (float32(dwInterp) / float32((int(1)<<uint(prop.numberOfBits))-1)))
 }
 
@@ -105,11 +105,11 @@ func (propertyDecoder) decodeSpecialFloat(prop *sendTableProperty, reader *bit.B
 	} else if prop.flags.hasFlagSet(propFlagNormal) {
 		return propDecoder.readBitNormal(reader)
 	} else if prop.flags.hasFlagSet(propFlagCellCoord) {
-		return propDecoder.readBitCellCoord(reader, uint(prop.numberOfBits), false, false)
+		return propDecoder.readBitCellCoord(reader, prop.numberOfBits, false, false)
 	} else if prop.flags.hasFlagSet(propFlagCellCoordLowPrecision) {
-		return propDecoder.readBitCellCoord(reader, uint(prop.numberOfBits), true, false)
+		return propDecoder.readBitCellCoord(reader, prop.numberOfBits, true, false)
 	} else if prop.flags.hasFlagSet(propFlagCellCoordIntegral) {
-		return propDecoder.readBitCellCoord(reader, uint(prop.numberOfBits), false, true)
+		return propDecoder.readBitCellCoord(reader, prop.numberOfBits, false, true)
 	}
 	panic(fmt.Sprintf("Unexpected special float flag (Flags %v)", prop.flags))
 }
@@ -196,7 +196,7 @@ func (propertyDecoder) readBitNormal(reader *bit.BitReader) float32 {
 	return res
 }
 
-func (propertyDecoder) readBitCellCoord(reader *bit.BitReader, bits uint, isIntegral bool, isLowPrecision bool) float32 {
+func (propertyDecoder) readBitCellCoord(reader *bit.BitReader, bits int, isIntegral bool, isLowPrecision bool) float32 {
 	var intVal, fractVal int
 	var res float32
 
@@ -245,7 +245,7 @@ func (propertyDecoder) decodeVector(prop *sendTableProperty, reader *bit.BitRead
 func (propertyDecoder) decodeArray(fProp *FlattenedPropEntry, reader *bit.BitReader) []PropValue {
 	numElement := fProp.prop.numberOfElements
 
-	var numBits uint = 1
+	numBits := 1
 
 	for maxElements := (numElement >> 1); maxElements != 0; maxElements = maxElements >> 1 {
 		numBits++