CS2: Player Inventory now includes initial loadout at the beginning of the game

Esben Glavind Clausen · Esben Glavind Clausen · commit 405d17c432a1 · 2023-10-18T10:21:20.000+02:00
diff --git a/pkg/demoinfocs/datatables.go b/pkg/demoinfocs/datatables.go
@@ -655,7 +655,7 @@ func (p *parser) bindPlayerWeaponsS2(pawnEntity st.Entity, pl *common.Player) {
 	var cache [maxWeapons]uint64
 	for i := range cache {
 		i2 := i // Copy for passing to handler
-		pawnEntity.Property(playerWeaponPrefixS2 + fmt.Sprintf("%04d", i)).OnUpdate(func(val st.PropertyValue) {
+		updateWeapon := func(val st.PropertyValue) {
 			if val.Any == nil {
 				return
 			}
@@ -691,7 +691,10 @@ func (p *parser) bindPlayerWeaponsS2(pawnEntity st.Entity, pl *common.Player) {
 
 				cache[i2] = 0
 			}
-		})
+		}
+		property := pawnEntity.Property(playerWeaponPrefixS2 + fmt.Sprintf("%04d", i))
+		updateWeapon(property.Value())
+		property.OnUpdate(updateWeapon)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ func (p parser) bindPlayerWeaponsS2(pawnEntity st.Entity, pl common.Player) {`
`655`	`655`	`var cache [maxWeapons]uint64`
`656`	`656`	`for i := range cache {`
`657`	`657`	`i2 := i // Copy for passing to handler`
`658`		`- pawnEntity.Property(playerWeaponPrefixS2 + fmt.Sprintf("%04d", i)).OnUpdate(func(val st.PropertyValue) {`
	`658`	`+ updateWeapon := func(val st.PropertyValue) {`
`659`	`659`	`if val.Any == nil {`
`660`	`660`	`return`
`661`	`661`	`}`
`@@ -691,7 +691,10 @@ func (p parser) bindPlayerWeaponsS2(pawnEntity st.Entity, pl common.Player) {`
`691`	`691`
`692`	`692`	`cache[i2] = 0`
`693`	`693`	`}`
`694`		`- })`
	`694`	`+ }`
	`695`	`+ property := pawnEntity.Property(playerWeaponPrefixS2 + fmt.Sprintf("%04d", i))`
	`696`	`+ updateWeapon(property.Value())`
	`697`	`+ property.OnUpdate(updateWeapon)`
`695`	`698`	`}`
`696`	`699`	`}`
`697`	`700`