Merge remote-tracking branch 'origin/master' into v5

Author: markus-wa

README.md

@@ -19,6 +19,12 @@ For business inquiries please use the contact information found on the [GitHub p
 
 ## Go Get
 
+### Counter-Strike 2 + Live Broadcast Parsing - aka. CSTV+ (BETA)
+
+	go get -u github.com/markus-wa/demoinfocs-golang/v5/pkg/demoinfocs
+
+See [v5 branch with broadcast example](https://github.com/markus-wa/demoinfocs-golang/tree/v5/examples/broadcasts)
+
 ### Counter-Strike 2
 
 	go get -u github.com/markus-wa/demoinfocs-golang/v5/pkg/demoinfocs

examples/viewmodel-settings/README.md

@@ -0,0 +1,25 @@
+# Player Viewmodel Settings
+
+This example shows how to use the library to extract player viewmodel settings from CS2 demos. Viewmodel settings include the viewmodel offset (X, Y, Z) and field of view.
+
+## Running the example
+
+`go run viewmodel_settings.go -demo /path/to/cs2-demo.dem`
+
+### Sample output
+
+```
+Player viewmodels:
+degster: Viewmodel Offset=(2.5, 0.0, -1.5), FOV=60.0
+kyxsan: Viewmodel Offset=(1.0, 1.0, -1.0), FOV=60.0
+NiKo: Viewmodel Offset=(-1.0, 1.5, -2.0), FOV=60.0
+SOMEBODY: Viewmodel Offset=(2.5, 2.0, -2.0), FOV=60.0
+Summer: Viewmodel Offset=(2.5, 0.0, -1.5), FOV=60.0
+L1haNg: Viewmodel Offset=(2.5, 0.0, -1.5), FOV=60.0
+ChildKing: Viewmodel Offset=(2.5, 1.0, -1.5), FOV=60.0
+TeSeS: Viewmodel Offset=(2.5, 0.0, -1.5), FOV=60.0
+Magisk: Viewmodel Offset=(2.5, 0.0, -1.5), FOV=60.0
+kaze: Viewmodel Offset=(2.5, 0.0, -1.5), FOV=60.0
+```
+
+Note: Viewmodel settings are only available in CS2 demos. CS:GO demos will show zero values.

examples/viewmodel-settings/viewmodel_settings.go

@@ -0,0 +1,52 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	ex "github.com/markus-wa/demoinfocs-golang/v4/examples"
+	demoinfocs "github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs"
+	events "github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs/events"
+)
+
+// Run like this: go run viewmodel_settings.go -demo /path/to/cs2-demo.dem
+func main() {
+	f, err := os.Open(ex.DemoPathFromArgs())
+	if err != nil {
+		panic(err)
+	}
+
+	defer f.Close()
+
+	p := demoinfocs.NewParser(f)
+	defer p.Close()
+
+	// Register handler on round start to collect viewmodel settings
+	p.RegisterEventHandler(func(e events.RoundStart) {
+		fmt.Println("Player viewmodels:")
+		gs := p.GameState()
+
+		// Get all connected players
+		players := gs.Participants().Playing()
+
+		for _, player := range players {
+			if player == nil {
+				continue
+			}
+
+			// Get viewmodel settings
+			offset := player.ViewmodelOffset()
+			fov := player.ViewmodelFOV()
+
+			fmt.Printf("%s: Viewmodel Offset=(%.1f, %.1f, %.1f), FOV=%.1f\n",
+				player.Name, offset.X, offset.Y, offset.Z, fov)
+		}
+		fmt.Println() // Empty line for readability
+	})
+
+	// Parse to end
+	err = p.ParseToEnd()
+	if err != nil {
+		panic(err)
+	}
+}

pkg/demoinfocs/common/equipment.go

@@ -164,6 +164,7 @@ func initEqNameToWeapon() {
 	eqNameToWeapon["hkp2000"] = EqP2000
 	eqNameToWeapon["incgrenade"] = EqIncendiary
 	eqNameToWeapon["incendiarygrenade"] = EqIncendiary
+	eqNameToWeapon["inferno"] = EqIncendiary
 	eqNameToWeapon["m249"] = EqM249
 	eqNameToWeapon["m4a1"] = EqM4A4
 	eqNameToWeapon["mac10"] = EqMac10

pkg/demoinfocs/common/player.go

@@ -449,6 +449,40 @@ func (p *Player) CrosshairCode() string {
 	return getString(p.Entity, "m_szCrosshairCodes")
 }
 
+// ViewmodelOffset returns the player's viewmodel offset as a 3D vector (X, Y, Z).
+// Returns zero vector if not available (CS:GO demos or player not alive).
+func (p *Player) ViewmodelOffset() r3.Vector {
+	if !p.demoInfoProvider.IsSource2() {
+		return r3.Vector{}
+	}
+
+	pawn := p.PlayerPawnEntity()
+	if pawn == nil {
+		return r3.Vector{}
+	}
+
+	return r3.Vector{
+		X: float64(getFloat(pawn, "m_flViewmodelOffsetX")),
+		Y: float64(getFloat(pawn, "m_flViewmodelOffsetY")),
+		Z: float64(getFloat(pawn, "m_flViewmodelOffsetZ")),
+	}
+}
+
+// ViewmodelFOV returns the player's viewmodel field of view.
+// Returns 0 if not available (CS:GO demos or player not alive).
+func (p *Player) ViewmodelFOV() float32 {
+	if !p.demoInfoProvider.IsSource2() {
+		return 0
+	}
+
+	pawn := p.PlayerPawnEntity()
+	if pawn == nil {
+		return 0
+	}
+
+	return getFloat(pawn, "m_flViewmodelFOV")
+}
+
 // Ping returns the players latency to the game server.
 func (p *Player) Ping() int {
 	return int(getUInt64(p.Entity, "m_iPing"))