small s2 fixes

Author: markus-wa

pkg/demoinfocs/common/player.go

@@ -274,6 +274,12 @@ func (p *Player) Health() int {
 
 // Armor returns the player's armor points, normally 0-100.
 func (p *Player) Armor() int {
+	s2Prop := p.Entity.Property("m_iPawnArmor")
+
+	if s2Prop != nil {
+		return s2Prop.Value().Int()
+	}
+
 	return getInt(p.Entity, "m_ArmorValue")
 }
 

pkg/demoinfocs/demoinfocs_test.go

@@ -31,10 +31,11 @@ const (
 	testDataPath            = "../../test"
 	csDemosPath             = testDataPath + "/cs-demos"
 	demSetPath              = csDemosPath + "/set"
+	demSetPathS2            = csDemosPath + "/s2"
 	defaultDemPath          = csDemosPath + "/default.dem"
 	retakeDemPath           = csDemosPath + "/retake_unknwon_bombsite_index.dem"
 	unexpectedEndOfDemoPath = csDemosPath + "/unexpected_end_of_demo.dem"
-	s2DemPath               = csDemosPath + "/s2.dem"
+	s2DemPath               = demSetPathS2 + "/s2.dem"
 )
 
 var concurrentDemos = flag.Int("concurrentdemos", 2, "The `number` of current demos")
@@ -217,10 +218,6 @@ func TestS2(t *testing.T) {
 	_, err = p.ParseHeader()
 	assertions.NoError(err, "error returned by Parser.ParseHeader()")
 
-	p.RegisterEventHandler(func(e any) {
-		fmt.Printf("%#v\n", e)
-	})
-
 	t.Log("Parsing to end")
 	err = p.ParseToEnd()
 	assertions.NoError(err, "error occurred in ParseToEnd()")
@@ -488,26 +485,20 @@ func runConcurrently(runner func()) {
 	wg.Wait()
 }
 
-func TestDemoSet(t *testing.T) {
-	t.Parallel()
-
-	if testing.Short() {
-		t.Skip("skipping test due to -short flag")
-	}
-
-	dems, err := ioutil.ReadDir(demSetPath)
-	assert.NoError(t, err, "failed to list directory %q", demSetPath)
+func testDemoSet(t *testing.T, path string) {
+	dems, err := os.ReadDir(path)
+	assert.NoError(t, err, "failed to list directory %q", path)
 
 	for _, d := range dems {
 		name := d.Name()
 		if strings.HasSuffix(name, ".dem") {
-			t.Logf("Parsing '%s/%s'\n", demSetPath, name)
+			t.Logf("Parsing '%s/%s'\n", path, name)
 			func() {
-				f := openFile(t, fmt.Sprintf("%s/%s", demSetPath, name))
+				f := openFile(t, fmt.Sprintf("%s/%s", path, name))
 				defer mustClose(t, f)
 
 				defer func() {
-					assert.Nil(t, recover(), "parsing of '%s/%s' panicked", demSetPath, name)
+					assert.Nil(t, recover(), "parsing of '%s/%s' panicked", path, name)
 				}()
 
 				p := demoinfocs.NewParser(f)
@@ -538,12 +529,32 @@ func TestDemoSet(t *testing.T) {
 				})
 
 				err = p.ParseToEnd()
-				assert.Nil(t, err, "parsing of '%s/%s' failed", demSetPath, name)
+				assert.NoError(t, err, "parsing of '%s/%s' failed", demSetPath, name)
 			}()
 		}
 	}
 }
 
+func TestDemoSet(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test due to -short flag")
+	}
+
+	t.Parallel()
+
+	testDemoSet(t, demSetPath)
+}
+
+func TestDemoSetS2(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test due to -short flag")
+	}
+
+	t.Parallel()
+
+	testDemoSet(t, demSetPathS2)
+}
+
 func BenchmarkDemoInfoCs(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		parseDefaultDemo(b)

pkg/demoinfocs/game_events.go

@@ -226,6 +226,7 @@ func newGameEventHandler(parser *parser, ignoreBombsiteIndexNotFound bool) gameE
 		"player_given_c4":                 nil,                                   // Dunno, only present in locally recorded (POV) demos
 		"player_ping":                     nil,                                   // When a player uses the "ping system" added with the operation Broken Fang, only present in locally recorded (POV) demos
 		"player_ping_stop":                nil,                                   // When a player's ping expired, only present in locally recorded (POV) demos
+		"player_sound":                    nil,                                   // When a player makes a sound. TODO: implement player_sound
 
 		// Player changed team. Delayed for two reasons
 		// - team IDs of other players changing teams in the same tick might not have changed yet

pkg/demoinfocs/stringtables.go

@@ -538,6 +538,8 @@ func (p *parser) processModelPreCacheUpdate() {
 // XXX TODO: decide if we want to at all integrate these updates,
 // or trust create/update entirely. Let's ignore them for now.
 func (p *parser) handleStringTables(msg *msgs2.CDemoStringTables) {
+	p.msgDispatcher.SyncAllQueues()
+
 	for _, tab := range msg.GetTables() {
 		if tab.GetTableName() == stNameInstanceBaseline {
 			for _, item := range tab.GetItems() {