common: add Player.IsReloading attribute

Author: markus-wa

common/player.go

@@ -48,6 +48,7 @@ type Player struct {
 	IsDucking                   bool
 	IsDefusing                  bool
 	IsPlanting                  bool
+	IsReloading                 bool
 	HasDefuseKit                bool
 	HasHelmet                   bool
 }

datatables.go

@@ -304,6 +304,7 @@ func (p *Parser) bindNewPlayer(playerEntity st.IEntity) {
 
 	// Active weapon
 	playerEntity.FindPropertyI("m_hActiveWeapon").OnUpdate(func(val st.PropertyValue) {
+		pl.IsReloading = false
 		pl.ActiveWeaponID = val.IntVal & entityHandleIndexMask
 	})
 
@@ -431,6 +432,10 @@ func (p *Parser) bindWeapon(entity *st.Entity, wepType common.EquipmentElement)
 
 	entity.FindPropertyI("m_iClip1").OnUpdate(func(val st.PropertyValue) {
 		eq.AmmoInMagazine = val.IntVal - 1
+
+		if eq.Owner != nil {
+			eq.Owner.IsReloading = false
+		}
 	})
 	// Some weapons in some demos might be missing this property
 	if reserveAmmoProp := entity.FindPropertyI("m_iPrimaryReserveAmmoCount"); reserveAmmoProp != nil {

demoinfocs_test.go

@@ -123,6 +123,21 @@ func TestDemoInfoCs(t *testing.T) {
 		}
 	})
 
+	// reload checks
+	p.RegisterEventHandler(func(reload events.WeaponReload) {
+		if !reload.Player.IsReloading {
+			t.Error("Player started reloading but IsReloading is false")
+		}
+	})
+
+	p.RegisterEventHandler(func(start events.RoundFreezetimeEnd) {
+		for _, pl := range p.GameState().Participants().All() {
+			if pl.IsReloading {
+				t.Error("Player is reloading at the start of the round")
+			}
+		}
+	})
+
 	// Check some things at match start
 	p.RegisterEventHandler(func(events.MatchStart) {
 		participants := gs.Participants()

game_events.go

@@ -281,8 +281,10 @@ func (geh gameEventHandler) weaponFire(data map[string]*msg.CSVCMsg_GameEventKey
 }
 
 func (geh gameEventHandler) weaponReload(data map[string]*msg.CSVCMsg_GameEventKeyT) {
+	pl := geh.playerByUserID32(data["userid"].GetValShort())
+	pl.IsReloading = true
 	geh.dispatch(events.WeaponReload{
-		Player: geh.playerByUserID32(data["userid"].GetValShort()),
+		Player: pl,
 	})
 }