Rename {T,CT}State() functions to Team{...}()

This way the functions are nicely ordered when sorted alphabetically

Author: markus-wa

demoinfocs_test.go

@@ -73,12 +73,12 @@ func TestDemoInfoCs(t *testing.T) {
 		var winnerSide string
 		switch e.Winner {
 		case common.TeamTerrorists:
-			winner = gs.TState()
-			loser = gs.CTState()
+			winner = gs.TeamTerrorists()
+			loser = gs.TeamCounterTerrorists()
 			winnerSide = "T"
 		case common.TeamCounterTerrorists:
-			winner = gs.CTState()
-			loser = gs.TState()
+			winner = gs.TeamCounterTerrorists()
+			loser = gs.TeamTerrorists()
 			winnerSide = "CT"
 		default:
 			// Probably match medic or something similar
@@ -204,19 +204,19 @@ func TestValveMatchmakingFuzzyEmitters(t *testing.T) {
 	p.RegisterEventHandler(func(ev events.RoundEndedEvent) {
 		switch ev.Winner {
 		case common.TeamTerrorists:
-			tScoreBeforeSwap = p.GameState().TState().Score() + 1
+			tScoreBeforeSwap = p.GameState().TeamTerrorists().Score() + 1
 
 		case common.TeamCounterTerrorists:
-			ctScoreBeforeSwap = p.GameState().CTState().Score() + 1
+			ctScoreBeforeSwap = p.GameState().TeamCounterTerrorists().Score() + 1
 		}
 	})
 
 	p.RegisterEventHandler(func(fuzzy.TeamSwitchEvent) {
 		teamSwitchDone = true
-		if tScoreBeforeSwap != p.GameState().CTState().Score() {
+		if tScoreBeforeSwap != p.GameState().TeamCounterTerrorists().Score() {
 			t.Error("T-Score before swap != CT-Score after swap")
 		}
-		if ctScoreBeforeSwap != p.GameState().TState().Score() {
+		if ctScoreBeforeSwap != p.GameState().TeamTerrorists().Score() {
 			t.Error("CT-Score before swap != T-Score after swap")
 		}
 	})

examples/print-events/print_events.go

@@ -43,9 +43,9 @@ func main() {
 		switch e.Winner {
 		case common.TeamTerrorists:
 			// Winner's score + 1 because it hasn't actually been updated yet
-			fmt.Printf("Round finished: winnerSide=T  ; score=%d:%d\n", gs.TState().Score()+1, gs.CTState().Score())
+			fmt.Printf("Round finished: winnerSide=T  ; score=%d:%d\n", gs.TeamTerrorists().Score()+1, gs.TeamCounterTerrorists().Score())
 		case common.TeamCounterTerrorists:
-			fmt.Printf("Round finished: winnerSide=CT ; score=%d:%d\n", gs.CTState().Score()+1, gs.TState().Score())
+			fmt.Printf("Round finished: winnerSide=CT ; score=%d:%d\n", gs.TeamCounterTerrorists().Score()+1, gs.TeamTerrorists().Score())
 		default:
 			// Probably match medic or something similar
 			fmt.Println("Round finished: No winner (tie)")

fuzzy/team_switch.go

@@ -42,8 +42,8 @@ func (em *ValveMatchmakingTeamSwitchEmitter) handleLastRoundHalf(events.LastRoun
 
 // Get scores before switch
 func (em *ValveMatchmakingTeamSwitchEmitter) handleRoundEnded(ev events.RoundEndedEvent) {
-	em.tScoreBeforeSwitch = em.parser.GameState().TState().Score()
-	em.ctScoreBeforeSwitch = em.parser.GameState().CTState().Score()
+	em.tScoreBeforeSwitch = em.parser.GameState().TeamTerrorists().Score()
+	em.ctScoreBeforeSwitch = em.parser.GameState().TeamCounterTerrorists().Score()
 
 	// Score hasn't been updated yet because CS:GO demos are weird
 	switch ev.Winner {
@@ -65,8 +65,8 @@ func (em *ValveMatchmakingTeamSwitchEmitter) handleRoundStarted(events.RoundStar
 
 // Wait for score to update - this isn't (necessarily?) the case after RoundStartedEvent
 func (em *ValveMatchmakingTeamSwitchEmitter) handleTickDone(events.TickDoneEvent) {
-	tScoreOk := em.parser.GameState().TState().Score() == em.ctScoreBeforeSwitch
-	ctScoreOk := em.parser.GameState().CTState().Score() == em.tScoreBeforeSwitch
+	tScoreOk := em.parser.GameState().TeamTerrorists().Score() == em.ctScoreBeforeSwitch
+	ctScoreOk := em.parser.GameState().TeamCounterTerrorists().Score() == em.tScoreBeforeSwitch
 	if tScoreOk && ctScoreOk {
 		em.dispatch(TeamSwitchEvent{})
 

game_state.go

@@ -29,17 +29,17 @@ func (gs GameState) IngameTick() int {
 	return gs.ingameTick
 }
 
-// CTState returns the TeamState of the CT team.
+// TeamCounterTerrorists returns the TeamState of the CT team.
 //
 // Make sure to handle swapping sides properly if you keep the reference.
-func (gs *GameState) CTState() *TeamState {
+func (gs *GameState) TeamCounterTerrorists() *TeamState {
 	return &gs.ctState
 }
 
-// TState returns the TeamState of the T team.
+// TeamTerrorists returns the TeamState of the T team.
 //
 // Make sure to handle swapping sides properly if you keep the reference.
-func (gs *GameState) TState() *TeamState {
+func (gs *GameState) TeamTerrorists() *TeamState {
 	return &gs.tState
 }