refactor: make linter happy

Author: akiver

pkg/demoinfocs/net_messages.go

@@ -25,9 +25,9 @@ func (p *parser) handlePacketEntities(pe *msg.CSVCMsg_PacketEntities) {
 	for i := 0; i < int(pe.GetUpdatedEntries()); i++ {
 		entityIndex += 1 + int(r.ReadUBitInt())
 
+		//nolint:nestif
 		if r.ReadBit() {
 			// FHDR_LEAVEPVS => LeavePVS
-
 			if r.ReadBit() {
 				// FHDR_LEAVEPVS | FHDR_DELETE => LeavePVS with force delete. Should never happen on full update
 				if existingEntity := p.gameState.entities[entityIndex]; existingEntity != nil {

pkg/demoinfocs/sendtables/entity.go

@@ -218,13 +218,15 @@ func (e *entity) initialize(recordingPlayerSlot int) {
 	if e.isPlayer() {
 		isGOTV := recordingPlayerSlot == -1
 		isRecording := recordingPlayerSlot == e.id-1
+
 		if isGOTV || isRecording {
 			e.positionPropNameXY = propVecOriginPlayerXY
 			e.positionPropNameZ = propVecOriginPlayerZ
 		} else {
 			e.positionPropNameXY = nonLocalPropVecOriginPlayerXY
 			e.positionPropNameZ = nonLocalPropVecOriginPlayerZ
 		}
+
 		xyProp := e.Property(e.positionPropNameXY)
 		zProp := e.Property(e.positionPropNameZ)
 

pkg/demoinfocs/sendtables/propdecoder.go

@@ -155,27 +155,30 @@ func (propertyDecoder) decodeInt64(prop *sendTableProperty, reader *bit.BitReade
 		}
 
 		return reader.ReadSignedVarInt64()
-	} else {
-		var high uint = 0
-		var low uint = 0
-		var isNegative bool = false
-		if prop.flags.hasFlagSet(propFlagUnsigned) {
-			low = reader.ReadInt(32)
-			high = reader.ReadInt(prop.numberOfBits - 32)
-		} else {
-			isNegative = reader.ReadBit()
-			low = reader.ReadInt(32)
-			high = reader.ReadInt(prop.numberOfBits - 32 - 1)
-		}
+	}
 
-		var result int64 = (int64(high) << 32) | int64(low)
+	var (
+		high       uint
+		low        uint
+		isNegative = false
+	)
 
-		if isNegative {
-			result = -result
-		}
+	if prop.flags.hasFlagSet(propFlagUnsigned) {
+		low = reader.ReadInt(32)
+		high = reader.ReadInt(prop.numberOfBits - 32)
+	} else {
+		isNegative = reader.ReadBit()
+		low = reader.ReadInt(32)
+		high = reader.ReadInt(prop.numberOfBits - 32 - 1)
+	}
+
+	var result = (int64(high) << 32) | int64(low)
 
-		return result
+	if isNegative {
+		result = -result
 	}
+
+	return result
 }
 
 func (propertyDecoder) decodeFloat(prop *sendTableProperty, reader *bit.BitReader) float32 {

pkg/demoinfocs/sendtables/sendtables.go

@@ -120,7 +120,7 @@ func (sc *ServerClass) PropertyEntryDefinitions() []PropertyEntry {
 	return res
 }
 
-func (sc *ServerClass) newEntity(entityDataReader *bit.BitReader, entityID int, classID int, serialNum int, recordingPlayerSlot int) *entity {
+func (sc *ServerClass) newEntity(entityDataReader *bit.BitReader, entityID int, serialNum int, recordingPlayerSlot int) *entity {
 	props := make([]property, len(sc.flattenedProps))
 
 	for i := range sc.flattenedProps {

pkg/demoinfocs/sendtables/st_parser.go

@@ -322,7 +322,7 @@ func (p *SendTableParser) ReadEnterPVS(r *bit.BitReader, entityID int, existingE
 		delete(existingEntities, entityID)
 	}
 
-	return p.serverClasses[classID].newEntity(r, entityID, classID, serialNum, recordingPlayerSlot)
+	return p.serverClasses[classID].newEntity(r, entityID, serialNum, recordingPlayerSlot)
 }
 
 // classBits seems to calculate how many bits must be read for the server-class ID.