Don't let people share colors

2 files changed, 26 insertions, 3 deletions

diff --git a/game.go b/game.go
index da63f9c..6c804ad 100644
--- a/game.go
+++ b/game.go
@@ -493,6 +493,26 @@ func (g *Game) WorldHeight() int {
 	return len(g.level[0])
 }
 
+func (g *Game) AvailableColors() []color.Attribute {
+	usedColors := map[color.Attribute]bool{}
+	for _, color := range playerColors {
+		usedColors[color] = false
+	}
+
+	for player := range g.players() {
+		usedColors[player.Color] = true
+	}
+
+	availableColors := []color.Attribute{}
+	for color, used := range usedColors {
+		if !used {
+			availableColors = append(availableColors, color)
+		}
+	}
+
+	return availableColors
+}
+
 func (g *Game) Run() {
 	// Proxy g.Redraw's channel to g.hub.Redraw
 	go func() {
@@ -589,9 +609,11 @@ type Session struct {
 	Player    *Player
 }
 
-func NewSession(c ssh.Channel, worldWidth, worldHeight int) *Session {
+func NewSession(c ssh.Channel, worldWidth, worldHeight int,
+	color color.Attribute) *Session {
+
 	s := Session{c: c}
-	s.newGame(worldWidth, worldHeight, -1)
+	s.newGame(worldWidth, worldHeight, color)
 
 	return &s
 }
diff --git a/main.go b/main.go
index da5b794..bc8215b 100644
--- a/main.go
+++ b/main.go
@@ -59,7 +59,8 @@ func handler(conn net.Conn, game *Game, config *ssh.ServerConfig) {
 
 		fmt.Println("Received new connection")
 
-		session := NewSession(channel, game.WorldWidth(), game.WorldHeight())
+		session := NewSession(channel, game.WorldWidth(), game.WorldHeight(),
+			game.AvailableColors()[0])
 		game.AddSession(session)
 
 		reader := bufio.NewReader(channel)