Renamed obstacle -> obstacle count

config.go

@@ -20,7 +20,7 @@ type Config struct {
 	Delta         float32 `json:"delta"`
 	Width         int     `json:"width"`
 	Height        int     `json:"height"`
-	Obstacles int     `json:"obstacles"`
+	ObstacleCount int     `json:"obstacle_count"`
 	MaxPoints     int     `json:"max_points"`
 	Mode          string  `json:"mode"`
 }
@@ -30,7 +30,7 @@ const (
 	TIMESCALE      = 1.0 // this tweaks the temporal duration of a TICK
 	WIDTH          = 800
 	HEIGHT         = 550
-	OBSTACLES    = 10
+	OBSTACLE_COUNT = 5
 	MAX_POINTS     = 500 // allowing for 50 pts in every category
 	DEFAULT_MODE   = "deathmatch"
 )
@@ -45,7 +45,7 @@ func LoadConfig(filename string) (Config, error) {
 		Timescale:     TIMESCALE,
 		Width:         WIDTH,
 		Height:        HEIGHT,
-		Obstacles: OBSTACLES,
+		ObstacleCount: OBSTACLE_COUNT,
 		MaxPoints:     MAX_POINTS,
 		Mode:          DEFAULT_MODE,
 	}

control.go

@@ -63,7 +63,7 @@ func (c *Controller) StartGame(w http.ResponseWriter, req *http.Request) {
 
 	requested_game_name := c.Idg.Hash()
 	width, height := float32(c.Conf.Width), float32(c.Conf.Height)
-	obstacles := 0
+	obstacleCount := 0
 	maxPoints := c.Conf.MaxPoints
 	mode := "deathmatch"
 
@@ -89,7 +89,7 @@ func (c *Controller) StartGame(w http.ResponseWriter, req *http.Request) {
 		requested_game_name = cfg.Name
 		width = float32(cfg.Width)
 		height = float32(cfg.Height)
-		obstacles = cfg.Obstacles
+		obstacleCount = cfg.ObstacleCount
 		maxPoints = cfg.MaxPoints
 		mode = cfg.Mode
 	}
@@ -98,7 +98,7 @@ func (c *Controller) StartGame(w http.ResponseWriter, req *http.Request) {
 	if g == nil {
 		log.Printf("Game '%s' non-existant; making it now", requested_game_name)
 		var err error
-		g, err = NewGame(requested_game_name, width, height, obstacles, c.Conf.Tick, maxPoints, mode)
+		g, err = NewGame(requested_game_name, width, height, obstacleCount, c.Conf.Tick, maxPoints, mode)
 		if err != nil {
 			log.Printf("problem creating game: %s: %s", requested_game_name, err)
 			b, _ := json.Marshal(NewFailure("game creation failure"))

protocol.go

@@ -177,7 +177,7 @@ func (c *Controller) AddPlayer(ws *websocket.Conn) {
 			gid.Id,
 			float32(c.Conf.Width),
 			float32(c.Conf.Height),
-			c.Conf.Obstacles,
+			c.Conf.ObstacleCount,
 			c.Conf.Tick,
 			c.Conf.MaxPoints,
 			"",