TeamState: fix Opponent containing wrong ref

fixes #90 (pointers are hard)

Author: markus-wa

game_events_test.go

@@ -0,0 +1,53 @@
+package demoinfocs
+
+import (
+	"crypto/rand"
+	"github.com/markus-wa/demoinfocs-golang/common"
+	"github.com/markus-wa/demoinfocs-golang/events"
+	"github.com/markus-wa/demoinfocs-golang/msg"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+// See #90
+func TestRoundEnd_LoserState_Score(t *testing.T) {
+	p := NewParser(rand.Reader)
+
+	p.gameState.tState.Score = 1
+	p.gameState.ctState.Score = 2
+
+	eventOccurred := 0
+	p.RegisterEventHandler(func(e events.RoundEnd) {
+		eventOccurred++
+		assert.Equal(t, e, events.RoundEnd{
+			Winner:      common.TeamTerrorists,
+			WinnerState: p.GameState().TeamTerrorists(),
+			LoserState:  p.GameState().TeamCounterTerrorists(),
+			Message:     "test",
+			Reason:      events.RoundEndReasonTerroristsWin,
+		})
+	})
+
+	p.gameEventDescs = map[int32]*msg.CSVCMsg_GameEventListDescriptorT{
+		1: {
+			Name: "round_end",
+			Keys: []*msg.CSVCMsg_GameEventListKeyT{
+				{Name: "winner"},
+				{Name: "message"},
+				{Name: "reason"},
+			},
+		},
+	}
+
+	ge := new(msg.CSVCMsg_GameEvent)
+	ge.Eventid = 1
+	ge.EventName = "round_end"
+	ge.Keys = []*msg.CSVCMsg_GameEventKeyT{
+		{ValByte: 2},
+		{ValString: "test"},
+		{ValByte: 9},
+	}
+	p.handleGameEvent(ge)
+
+	assert.Equal(t, 1, eventOccurred)
+}

parser.go

@@ -51,7 +51,7 @@ type Parser struct {
 	eventDispatcher              dp.Dispatcher
 	currentFrame                 int                // Demo-frame, not ingame-tick
 	header                       *common.DemoHeader // Pointer so we can check for nil
-	gameState                    GameState
+	gameState                    *GameState
 	cancelChan                   chan struct{} // Non-anime-related, used for aborting the parsing
 	err                          error         // Contains a error that occurred during parsing if any
 	errLock                      sync.Mutex    // Used to sync up error mutations between parsing & handling go-routines
@@ -103,7 +103,7 @@ func (p *Parser) Header() common.DemoHeader {
 // GameState returns the current game-state.
 // It contains most of the relevant information about the game such as players, teams, scores, grenades etc.
 func (p *Parser) GameState() IGameState {
-	return &p.gameState
+	return p.gameState
 }
 
 // CurrentFrame return the number of the current frame, aka. 'demo-tick' (Since demos often have a different tick-rate than the game).
@@ -232,7 +232,7 @@ func NewParserWithConfig(demostream io.Reader, config ParserConfig) *Parser {
 	p.rawPlayers = make(map[int]*playerInfo)
 	p.triggers = make(map[int]*boundingBoxInformation)
 	p.cancelChan = make(chan struct{}, 1)
-	p.gameState = *newGameState()
+	p.gameState = newGameState()
 	p.grenadeModelIndices = make(map[int]common.EquipmentElement)
 
 	// Attach proto msg handlers