S2 progress: parsing with player entities successful

Author: markus-wa

pkg/demoinfocs/common/player.go

@@ -35,6 +35,18 @@ type Player struct {
 	IsUnknown         bool // Used to identify unknown/broken players. see https://github.com/markus-wa/demoinfocs-golang/issues/162
 }
 
+func (p *Player) PlayerPawnEntity() st.Entity {
+	return p.demoInfoProvider.FindEntityByHandle(p.Entity.PropertyValueMust("m_hPlayerPawn").Handle())
+}
+
+func (p *Player) GetTeam() Team {
+	return Team(p.PlayerPawnEntity().PropertyValueMust("m_iTeamNum").S2UInt64())
+}
+
+func (p *Player) GetFlashDuration() float32 {
+	return p.PlayerPawnEntity().PropertyValueMust("m_flFlashDuration").Float()
+}
+
 // String returns the player's name.
 // Implements fmt.Stringer.
 func (p *Player) String() string {
@@ -501,6 +513,7 @@ type demoInfoProvider interface {
 	FindPlayerByHandle(handle int) *Player
 	PlayerResourceEntity() st.Entity
 	FindWeaponByEntityID(id int) *Equipment
+	FindEntityByHandle(handle uint64) st.Entity
 }
 
 // NewPlayer creates a *Player with an initialized equipment map.

pkg/demoinfocs/datatables.go

@@ -191,6 +191,9 @@ func (p *parser) bindBombSites() {
 
 func (p *parser) bindPlayers() {
 	if p.isSource2() {
+		p.stParser.ServerClasses().FindByName("CCSPlayerController").OnEntityCreated(func(player st.Entity) {
+			p.bindNewPlayerControllerS2(player)
+		})
 		p.stParser.ServerClasses().FindByName("CCSPlayerPawn").OnEntityCreated(func(player st.Entity) {
 			p.bindNewPlayerPawnS2(player)
 		})
@@ -323,11 +326,7 @@ func (p *parser) bindNewPlayerS1(playerEntity st.Entity) {
 	}
 }
 
-func (p *parser) bindNewPlayerPawnS2(pawnEntity st.Entity) {
-	controllerHandle := pawnEntity.Property("m_hController").Value().Handle()
-
-	controllerEntity := p.gameState.EntityByHandle(controllerHandle)
-
+func (p *parser) bindNewPlayerControllerS2(controllerEntity st.Entity) {
 	controllerEntityID := controllerEntity.ID()
 
 	rp := p.rawPlayers[controllerEntityID-1]
@@ -350,73 +349,78 @@ func (p *parser) bindNewPlayerPawnS2(pawnEntity st.Entity) {
 		}
 	})
 
-	// General info
-	pawnEntity.Property("m_iTeamNum").OnUpdate(func(val st.PropertyValue) {
-		pl.Team = common.Team(val.IntVal)
-		pl.TeamState = p.gameState.Team(pl.Team)
-	})
+	if isNew {
+		if pl.SteamID64 != 0 {
+			p.eventDispatcher.Dispatch(events.PlayerConnect{Player: pl})
+		} else {
+			p.eventDispatcher.Dispatch(events.BotConnect{Player: pl})
+		}
+	}
+}
+
+func (p *parser) bindNewPlayerPawnS2(pawnEntity st.Entity) {
+	player := func() *common.Player {
+		return p.gameState.Participants().FindByHandle64(pawnEntity.PropertyValueMust("m_hController").Handle())
+	}
 
 	pawnEntity.Property("m_flFlashDuration").OnUpdate(func(val st.PropertyValue) {
-		if val.FloatVal == 0 {
+		pl := player()
+		if pl == nil {
+			return
+		}
+
+		if val.Float() == 0 {
 			pl.FlashTick = 0
 		} else {
 			pl.FlashTick = p.gameState.ingameTick
 		}
 
-		pl.FlashDuration = val.FloatVal
+		pl.FlashDuration = val.Float()
 	})
 
-	if !p.isSource2() {
-		p.bindPlayerWeapons(controllerEntity, pl) // FIXME: make weapons work for S2
-
-		for i := 0; i < 32; i++ {
-			i2 := i // Copy so it stays the same
-			controllerEntity.BindProperty("m_iAmmo."+fmt.Sprintf("%03d", i2), &pl.AmmoLeft[i2], st.ValTypeInt)
+	//p.bindPlayerWeapons(controllerEntity, pl) // FIXME: make weapons work for S2
+	//
+	//for i := 0; i < 32; i++ {
+	//	i2 := i // Copy so it stays the same
+	//	controllerEntity.BindProperty("m_iAmmo."+fmt.Sprintf("%03d", i2), &pl.AmmoLeft[i2], st.ValTypeInt)
+	//}
+
+	pawnEntity.Property("m_pWeaponServices.m_hActiveWeapon").OnUpdate(func(val st.PropertyValue) {
+		pl := player()
+		if pl == nil {
+			return
 		}
-	}
-
-	var (
-		activeWep       st.Property
-		spottedByPrefix string
-	)
 
-	if p.isSource2() {
-		activeWep = pawnEntity.Property("m_pWeaponServices.m_hActiveWeapon")
-		spottedByPrefix = "m_bSpottedByMask.000"
-	} else {
-		activeWep = pawnEntity.Property("m_hActiveWeapon")
-		spottedByPrefix = "m_bSpottedByMask.00"
-	}
-
-	activeWep.OnUpdate(func(val st.PropertyValue) {
 		pl.IsReloading = false
 	})
 
 	pawnEntity.Property("m_bIsDefusing").OnUpdate(func(val st.PropertyValue) {
-		if p.gameState.currentDefuser == pl && pl.IsDefusing && val.IntVal == 0 {
+		pl := player()
+		if pl == nil {
+			return
+		}
+
+		if p.gameState.currentDefuser == pl && pl.IsDefusing && !val.BoolVal() {
 			p.eventDispatcher.Dispatch(events.BombDefuseAborted{Player: pl})
 			p.gameState.currentDefuser = nil
 		}
 
-		pl.IsDefusing = val.IntVal != 0
+		pl.IsDefusing = val.BoolVal()
 	})
 
-	spottedByMaskProp := pawnEntity.Property(spottedByPrefix + "0")
+	spottedByMaskProp := pawnEntity.Property("m_bSpottedByMask.0000")
 	if spottedByMaskProp != nil {
+		pl := player()
+		if pl == nil {
+			return
+		}
+
 		spottersChanged := func(val st.PropertyValue) {
 			p.eventDispatcher.Dispatch(events.PlayerSpottersChanged{Spotted: pl})
 		}
 
 		spottedByMaskProp.OnUpdate(spottersChanged)
-		pawnEntity.Property(spottedByPrefix + "1").OnUpdate(spottersChanged)
-	}
-
-	if isNew {
-		if pl.SteamID64 != 0 {
-			p.eventDispatcher.Dispatch(events.PlayerConnect{Player: pl})
-		} else {
-			p.eventDispatcher.Dispatch(events.BotConnect{Player: pl})
-		}
+		pawnEntity.Property("m_bSpottedByMask.0001").OnUpdate(spottersChanged)
 	}
 }
 

pkg/demoinfocs/parser.go

@@ -436,6 +436,10 @@ func (p demoInfoProvider) FindPlayerByHandle(handle int) *common.Player {
 	return p.parser.gameState.Participants().FindByHandle(handle)
 }
 
+func (p demoInfoProvider) FindEntityByHandle(handle uint64) st.Entity {
+	return p.parser.gameState.EntityByHandle(handle)
+}
+
 func (p demoInfoProvider) PlayerResourceEntity() st.Entity {
 	return p.parser.gameState.playerResourceEntity
 }

pkg/demoinfocs/sendtables2/entity.go

@@ -465,7 +465,6 @@ func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
 		cmd     uint32
 		classId int32
 		serial  int32
-		e       *Entity
 	)
 
 	if !m.GetIsDelta() {
@@ -475,12 +474,22 @@ func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
 		p.entityFullPackets++
 	}
 
+	type tuple struct {
+		ent *Entity
+		op  st.EntityOp
+	}
+
+	var tuples []tuple
+
 	for ; updates > 0; updates-- {
+		var (
+			e  *Entity
+			op st.EntityOp
+		)
+
 		next := index + int32(r.readUBitVar()) + 1
 		index = next
 
-		var op st.EntityOp
-
 		cmd = r.readBits(2)
 		if cmd&0x01 == 0 {
 			if cmd&0x02 != 0 {
@@ -544,11 +553,27 @@ func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
 			}
 		}
 
+		tuples = append(tuples, tuple{e, op})
+	}
+
+	for _, t := range tuples {
+		e := t.ent
+
 		for _, h := range p.entityHandlers {
-			if err := h(e, op); err != nil {
+			if err := h(e, t.op); err != nil {
 				return err
 			}
 		}
+
+		if t.op&st.EntityOpCreated != 0 {
+			for prop, hs := range e.updateHandlers {
+				v := e.PropertyValueMust(prop)
+
+				for _, h := range hs {
+					h(v)
+				}
+			}
+		}
 	}
 
 	if r.remBytes() > 1 || r.bitCount > 7 {