S2: fix pos + smaller fixes

Author: markus-wa

.golangci.yml

@@ -13,7 +13,6 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - depguard
     - dogsled
     - dupl
     - exportloopref

pkg/demoinfocs/common/common.go

@@ -217,9 +217,7 @@ func NewTeamState(team Team, membersCallback func(Team) []*Player) TeamState {
 // ConvertSteamIDTxtTo32 converts a Steam-ID in text format to a 32-bit variant.
 // See https://developer.valvesoftware.com/wiki/SteamID
 func ConvertSteamIDTxtTo32(steamID string) (uint32, error) {
-	if strings.HasSuffix(steamID, "]") {
-		steamID = strings.TrimSuffix(steamID, "]") // Source 2 has [U:1:397560266] instead of STEAM_0:1:198780133
-	}
+	steamID = strings.TrimSuffix(steamID, "]") // Source 2 has [U:1:397560266] instead of STEAM_0:1:198780133
 
 	arr := strings.Split(steamID, ":")
 

pkg/demoinfocs/common/player.go

@@ -65,7 +65,9 @@ func (p *Player) SteamID32() uint32 {
 
 // IsAlive returns true if the player is alive.
 func (p *Player) IsAlive() bool {
-	return p.Health() > 0 || getInt(p.Entity, "m_lifeState") == 0
+	s1LifeState := p.Entity.Property("m_lifeState")
+
+	return p.Health() > 0 || (s1LifeState != nil && s1LifeState.Value().Int() == 0)
 }
 
 // IsBlinded returns true if the player is currently flashed.
@@ -257,6 +259,12 @@ func (p *Player) ControlledBot() *Player {
 
 // Health returns the player's health points, normally 0-100.
 func (p *Player) Health() int {
+	s2Prop := p.Entity.Property("m_iPawnHealth")
+
+	if s2Prop != nil {
+		return int(s2Prop.Value().S2UInt64())
+	}
+
 	return getInt(p.Entity, "m_iHealth")
 }
 

pkg/demoinfocs/datatables.go

@@ -339,13 +339,6 @@ func (p *parser) bindNewPlayerControllerS2(controllerEntity st.Entity) {
 		pl.Entity = nil
 	})
 
-	// Position
-	controllerEntity.OnPositionUpdate(func(pos r3.Vector) {
-		if pl.IsAlive() {
-			pl.LastAlivePosition = pos
-		}
-	})
-
 	if isNew {
 		if pl.SteamID64 != 0 {
 			p.eventDispatcher.Dispatch(events.PlayerConnect{Player: pl})
@@ -360,6 +353,18 @@ func (p *parser) bindNewPlayerPawnS2(pawnEntity st.Entity) {
 		return p.gameState.Participants().FindByHandle64(pawnEntity.PropertyValueMust("m_hController").Handle())
 	}
 
+	// Position
+	pawnEntity.OnPositionUpdate(func(pos r3.Vector) {
+		pl := player()
+		if pl == nil {
+			return
+		}
+
+		if pl.IsAlive() {
+			pl.LastAlivePosition = pos
+		}
+	})
+
 	pawnEntity.Property("m_flFlashDuration").OnUpdate(func(val st.PropertyValue) {
 		pl := player()
 		if pl == nil {

pkg/demoinfocs/sendtables2/entity.go

@@ -167,66 +167,51 @@ func (e *Entity) ApplyUpdate(reader *bit.BitReader) {
 const (
 	serverClassPlayer = "CCSPlayerPawn"
 
-	maxCoordInt = 16384
-
-	propCellBits          = "m_cellbits"
-	propCellX             = "CBodyComponent.m_cellX"
-	propCellY             = "CBodyComponent.m_cellY"
-	propCellZ             = "CBodyComponent.m_cellZ"
-	propVecOrigin         = "m_vecOrigin"
-	propVecOriginPlayerXY = "cslocaldata.m_vecOrigin"
-	propVecOriginPlayerZ  = "cslocaldata.m_vecOrigin[2]"
+	propCellX = "CBodyComponent.m_cellX"
+	propCellY = "CBodyComponent.m_cellY"
+	propCellZ = "CBodyComponent.m_cellZ"
+	propVecX  = "CBodyComponent.m_vecX"
+	propVecY  = "CBodyComponent.m_vecY"
+	propVecZ  = "CBodyComponent.m_vecZ"
 )
 
 func (e *Entity) isPlayer() bool {
 	return e.class.name == serverClassPlayer
 }
 
 // Returns a coordinate from a cell + offset
-func coordFromCell(cell, cellWidth int, offset float64) float64 {
-	return float64(cell*cellWidth-maxCoordInt) + offset
+func coordFromCell(cell uint64, offset float32) float64 {
+	const (
+		cellBits    = 9
+		maxCoordInt = 16384
+	)
+
+	return float64(cell*(1<<cellBits)-maxCoordInt) + float64(offset)
 }
 
 func (e *Entity) Position() r3.Vector {
-	return r3.Vector{} // FIXME: implement
-
-	if e.isPlayer() {
-		// FIXME: POV demo support
-		xyProp := e.Property(propVecOriginPlayerXY)
-		zProp := e.Property(propVecOriginPlayerZ)
-
-		xy := xyProp.Value().VectorVal
-		z := float64(zProp.Value().FloatVal)
-
-		return r3.Vector{
-			X: xy.X,
-			Y: xy.Y,
-			Z: z,
-		}
-	}
-
-	cellBitsProp := e.Property(propCellBits)
 	cellXProp := e.Property(propCellX)
 	cellYProp := e.Property(propCellY)
 	cellZProp := e.Property(propCellZ)
-	offsetProp := e.Property(propVecOrigin)
+	offsetXProp := e.Property(propVecX)
+	offsetYProp := e.Property(propVecY)
+	offsetZProp := e.Property(propVecZ)
 
-	cellWidth := 1 << uint(cellBitsProp.Value().IntVal)
-	cellX := cellXProp.Value().IntVal
-	cellY := cellYProp.Value().IntVal
-	cellZ := cellZProp.Value().IntVal
-	offset := offsetProp.Value().VectorVal
+	cellX := cellXProp.Value().S2UInt64()
+	cellY := cellYProp.Value().S2UInt64()
+	cellZ := cellZProp.Value().S2UInt64()
+	offsetX := offsetXProp.Value().Float()
+	offsetY := offsetYProp.Value().Float()
+	offsetZ := offsetZProp.Value().Float()
 
 	return r3.Vector{
-		X: coordFromCell(cellX, cellWidth, offset.X),
-		Y: coordFromCell(cellY, cellWidth, offset.Y),
-		Z: coordFromCell(cellZ, cellWidth, offset.Z),
+		X: coordFromCell(cellX, offsetX),
+		Y: coordFromCell(cellY, offsetY),
+		Z: coordFromCell(cellZ, offsetZ),
 	}
 }
 
 func (e *Entity) OnPositionUpdate(h func(pos r3.Vector)) {
-	return // FIXME: implement
-
 	pos := new(r3.Vector)
 	firePosUpdate := func(st.PropertyValue) {
 		newPos := e.Position()
@@ -236,15 +221,12 @@ func (e *Entity) OnPositionUpdate(h func(pos r3.Vector)) {
 		}
 	}
 
-	if e.isPlayer() {
-		e.Property(propVecOriginPlayerXY).OnUpdate(firePosUpdate) // FIXME: POV demos use different property names
-		e.Property(propVecOriginPlayerZ).OnUpdate(firePosUpdate)
-	} else {
-		e.Property(propCellX).OnUpdate(firePosUpdate)
-		e.Property(propCellY).OnUpdate(firePosUpdate)
-		e.Property(propCellZ).OnUpdate(firePosUpdate)
-		e.Property(propVecOrigin).OnUpdate(firePosUpdate)
-	}
+	e.Property(propCellX).OnUpdate(firePosUpdate)
+	e.Property(propCellY).OnUpdate(firePosUpdate)
+	e.Property(propCellZ).OnUpdate(firePosUpdate)
+	e.Property(propVecX).OnUpdate(firePosUpdate)
+	e.Property(propVecY).OnUpdate(firePosUpdate)
+	e.Property(propVecZ).OnUpdate(firePosUpdate)
 }
 
 func (e *Entity) OnDestroy(delegate func()) {
@@ -417,12 +399,14 @@ func (p *Parser) FindEntityByHandle(handle uint64) *Entity {
 
 // FilterEntity finds entities by callback
 func (p *Parser) FilterEntity(fb func(*Entity) bool) []*Entity {
-	entities := make([]*Entity, 0, 0)
+	entities := make([]*Entity, 0)
+
 	for _, et := range p.entities {
 		if fb(et) {
 			entities = append(entities, et)
 		}
 	}
+
 	return entities
 }
 
@@ -435,20 +419,17 @@ func (e *Entity) readFields(r *reader) {
 		val := decoder(r)
 		e.state.set(fp, val)
 
-		upd := e.updateHandlers[e.class.getNameForFieldPath(fp)]
-		if upd != nil {
-			for _, h := range upd {
-				h(st.PropertyValue{
-					VectorVal: r3.Vector{},
-					IntVal:    0,
-					Int64Val:  0,
-					ArrayVal:  nil,
-					StringVal: "",
-					FloatVal:  0,
-					Any:       val,
-					S2:        true,
-				})
-			}
+		for _, h := range e.updateHandlers[e.class.getNameForFieldPath(fp)] {
+			h(st.PropertyValue{
+				VectorVal: r3.Vector{},
+				IntVal:    0,
+				Int64Val:  0,
+				ArrayVal:  nil,
+				StringVal: "",
+				FloatVal:  0,
+				Any:       val,
+				S2:        true,
+			})
 		}
 
 		fp.release()

pkg/demoinfocs/sendtables2/field_path.go

@@ -309,11 +309,13 @@ func (fp *fieldPath) release() {
 func readFieldPaths(r *reader) []*fieldPath {
 	fp := newFieldPath()
 
-	node, next := huffTree, huffTree
+	node := huffTree
 
 	paths := []*fieldPath{}
 
 	for !fp.done {
+		var next huffmanTree
+
 		if r.readBits(1) == 1 {
 			next = node.Right()
 		} else {

pkg/demoinfocs/sendtables2/reader.go

@@ -166,13 +166,13 @@ func (r *reader) readUBitVar() uint32 {
 	switch ret & 0x30 {
 	case 16:
 		ret = (ret & 15) | (r.readBits(4) << 4)
-		break
+
 	case 32:
 		ret = (ret & 15) | (r.readBits(8) << 4)
-		break
+
 	case 48:
 		ret = (ret & 15) | (r.readBits(28) << 4)
-		break
+
 	}
 
 	return ret