Fixed unsassigned players becoming CTs

Author: markus-wa

common/structs.go

@@ -40,7 +40,6 @@ type Player struct {
 	LastAlivePosition           r3.Vector
 	Velocity                    r3.Vector
 	EntityID                    int
-	TeamID                      int
 	Name                        string
 	Hp                          int
 	Armor                       int

datatables.go

@@ -81,16 +81,13 @@ func (p *Parser) bindTeamScores() {
 			team := val.StringVal
 
 			var s *TeamState
-			var t common.Team
 
 			switch team {
 			case "CT":
 				s = &p.gameState.ctState
-				t = common.TeamCounterTerrorists
 
 			case "TERRORIST":
 				s = &p.gameState.tState
-				t = common.TeamTerrorists
 
 			case "Unassigned": // Ignore
 			case "Spectator": // Ignore
@@ -117,16 +114,6 @@ func (p *Parser) bindTeamScores() {
 				event.Entity.FindProperty("m_scoreTotal").RegisterPropertyUpdateHandler(func(val st.PropValue) {
 					s.score = val.IntVal
 				})
-
-				// FIXME: This only sets the team at the start. . . We also have a player-specific update handler that changes the team so maybe this is unnecessary?
-				if teamID != -1 {
-					s.id = teamID
-					for _, pl := range p.entityIDToPlayers {
-						if pl != nil && pl.TeamID == teamID {
-							pl.Team = t
-						}
-					}
-				}
 			}
 		})
 	})
@@ -211,17 +198,7 @@ func (p *Parser) bindNewPlayer(playerEntity *st.Entity) {
 	})
 
 	playerEntity.FindProperty("m_iTeamNum").RegisterPropertyUpdateHandler(func(val st.PropValue) {
-		pl.TeamID = val.IntVal
-
-		// FIXME: We could probably just cast TeamID to common.Team or not even set it because the teamIDs should be the same. . . needs testing
-		switch pl.TeamID {
-		case p.gameState.ctState.id:
-			pl.Team = common.TeamCounterTerrorists
-		case p.gameState.tState.id:
-			pl.Team = common.TeamTerrorists
-		default:
-			pl.Team = common.TeamSpectators
-		}
+		pl.Team = common.Team(val.IntVal)
 	})
 
 	// Some helpers because I cant be arsed

demoinfocs_test.go

@@ -48,8 +48,8 @@ func TestDemoInfoCs(t *testing.T) {
 	}
 
 	fmt.Println("Registering handlers")
+	gs := p.GameState()
 	p.RegisterEventHandler(func(e events.RoundEndedEvent) {
-		gs := p.GameState()
 		var winner *dem.TeamState
 		var loser *dem.TeamState
 		var winnerSide string
@@ -80,6 +80,19 @@ func TestDemoInfoCs(t *testing.T) {
 			t.Error("Unexprected default value, check output of last round")
 		}
 	})
+	// Check some things at match start
+	p.RegisterEventHandler(func(events.MatchStartedEvent) {
+		participants := gs.Participants()
+		players := gs.PlayingParticipants()
+		if len(participants) <= len(players) {
+			// We know the default demo has spectators
+			t.Error("Expected more participants than players (spectators)")
+		}
+		if nPlayers := len(players); nPlayers != 10 {
+			// We know there should be 10 players at match start in the default demo
+			t.Error("Expected 10 players; got", nPlayers)
+		}
+	})
 
 	ts := time.Now()
 	var done int64

game_state.go

@@ -47,12 +47,11 @@ func (gs GameState) Participants() []*common.Player {
 	return r
 }
 
-// PlayingParticipants returns all players that aren't spectating.
+// PlayingParticipants returns all players that aren't spectating or unassigned.
 func (gs GameState) PlayingParticipants() []*common.Player {
 	r := make([]*common.Player, 0, len(gs.players))
 	for _, ptcp := range gs.players {
-		// FIXME: Why do we have to check for nil here???
-		if ptcp != nil && ptcp.Team != common.TeamSpectators {
+		if ptcp.Team != common.TeamSpectators && ptcp.Team != common.TeamUnassigned {
 			r = append(r, ptcp)
 		}
 	}