From 49ff6af1f3cb43631a927f5d5dac71843cabfcca Mon Sep 17 00:00:00 2001 From: Stephen McQuay Date: Thu, 7 Nov 2013 22:10:59 -0800 Subject: [PATCH] minor cleanup - removed comment-disabled code - reduced verbosity in protocol logging --- game.go | 2 -- player.go | 3 --- protocol.go | 6 ------ 3 files changed, 11 deletions(-) diff --git a/game.go b/game.go index 84eea66..04af1ff 100644 --- a/game.go +++ b/game.go @@ -220,8 +220,6 @@ func (g *game) send_update(payload *Boardstate) { player_payload.Obstacles = payload.Obstacles } - // x, _ := json.Marshal(player_payload) - // log.Printf("%v", string(x)) p.send <- player_payload } for s := range g.spectators { diff --git a/player.go b/player.go index 2dd25c4..d1f2783 100644 --- a/player.go +++ b/player.go @@ -106,7 +106,6 @@ func (p *player) checkCollisions(g *game, move_vector v.Vector2d) (bool, v.Point player_rect := v.RectFromPoint(player.Robot.Position, 3) collision, _, pos := v.RectIntersection(player_rect, p.Robot.Position, move_vector) if collision { - // log.Printf("Player Collision %v hit %v, rect:%v", p.Robot.Position, move_vector, player_rect) return collision, pos, player } } @@ -115,7 +114,6 @@ func (p *player) checkCollisions(g *game, move_vector v.Vector2d) (bool, v.Point for _, obj := range g.obstacles { collision, _, pos := v.RectIntersection(obj.Bounds, p.Robot.Position, move_vector) if collision { - // log.Printf("Object Collision %v hit %v, rect:%v", p.Robot.Position, move_vector, obj.Bounds) return collision, pos, nil } } @@ -193,7 +191,6 @@ func (p *player) Tick(g *game) { p.Robot.Position = p.Robot.Position.Add(move_vector) if new_heading.Mag() > 0 { p.Robot.Heading = new_heading - // log.Printf("%v %v %v", new_heading, current_heading, angle) } else { log.Printf("Zero Heading %v", new_heading) } diff --git a/protocol.go b/protocol.go index 554a6b3..aac2ca9 100644 --- a/protocol.go +++ b/protocol.go @@ -98,15 +98,11 @@ func addPlayer(ws *websocket.Conn) { log.Println("problem parsing the requested game id") return } - log.Printf("requested game id: %+v", gid) game := games.get(gid.Id) - log.Printf("found game: %p", game) if game == nil { - log.Println("game was nil") force := *debug if force { - log.Println("forcing game start") game = NewGame(gid.Id, float32(*width), float32(*height)) go game.run() games.add(game) @@ -140,7 +136,6 @@ func addPlayer(ws *websocket.Conn) { ) return } - log.Printf("%s: %s clientid: %+v", gid.Id, player_id, clientid) gameParam := NewGameParam(game.width, game.height) err = websocket.JSON.Send(ws, gameParam) @@ -149,7 +144,6 @@ func addPlayer(ws *websocket.Conn) { websocket.JSON.Send(ws, NewFailure("game param parse error")) return } - log.Printf("gameparam: %+v", gameParam) switch clientid.Type { case "robot":