All robots are spectators

botspectate/main.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"hackerbots.us/client"
+	"hackerbots.us/server"
 )
 
 var serverHostname = flag.String("server", "localhost", "server hostname")
@@ -26,12 +27,15 @@ func main() {
 	}
 
 	c := &client.Client{
-		Server:    *serverHostname,
-		Port:      *port,
-		Name:      "bspect",
-		GameId:    gameId,
-		Verbose:   *verbose,
-		ForceJSON: *forceJSON,
+		Server:      *serverHostname,
+		Port:        *port,
+		Name:        "bspect",
+		GameId:      gameId,
+		Verbose:     *verbose,
+		ForceJSON:   *forceJSON,
+		StateStream: make(chan *server.Boardstate),
+		Die:         make(chan struct{}),
+		Player:      client.Spectator{},
 	}
 	var err error
 	err = c.Negociate("spectator")
@@ -39,17 +43,10 @@ func main() {
 		log.Fatalf("%s: failed to negociate: %s", c.Name, err)
 	}
 
-	spectator := client.NewSimpleSpectator(
-		c.Game.BoardSize.Width,
-		c.Game.BoardSize.Height,
-	)
-	c.Player = spectator
-
 	go func() {
 		if err := c.Play(); err != nil {
-			close(spectator.Die)
+			close(c.Die)
 		}
 	}()
-
-	spectator.Run()
+	c.Visualize()
 }