sm
/
simple-web-game
1
0
Fork 0
Code Issues Pull Requests Activity

update imports for golang.org/x/

This commit is contained in:
Stephen McQuay 2014-11-25 00:07:16 -08:00
parent 459a69991d
commit 5b6938b927
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.go
View File

@ -1,11 +1,12 @@
package main package main
import ( import (
"code.google.com/p/go.net/websocket"
"flag" "flag"
"fmt" "fmt"
"log" "log"
"net/http" "net/http"
"golang.org/x/net/websocket"
) )
var addr = flag.String("addr", ":8666", "http service address") var addr = flag.String("addr", ":8666", "http service address")

31
player.go
View File

@ -1,11 +1,12 @@
package main package main
import ( import (
"code.google.com/p/go.net/websocket"
"encoding/json" "encoding/json"
"fmt" "fmt"
"log" "log"
"math" "math"
"golang.org/x/net/websocket"
) )
type Position struct { type Position struct {
@ -20,14 +21,14 @@ type player struct {
} }
func (p *player) validMove(next Position) (r bool) { func (p *player) validMove(next Position) (r bool) {
r = true r = true
if math.Abs(float64(p.Position.X - next.X)) > 1 { if math.Abs(float64(p.Position.X-next.X)) > 1 {
r = false r = false
} }
if math.Abs(float64(p.Position.Y - next.Y)) > 1 { if math.Abs(float64(p.Position.Y-next.Y)) > 1 {
r = false r = false
} }
return return
} }
func (p *player) sender() { func (p *player) sender() {
@ -48,15 +49,15 @@ func (p *player) recv() {
break break
} }
// XXX: the danger! // XXX: the danger!
var pos Position var pos Position
err = json.Unmarshal([]byte(msg), &pos) err = json.Unmarshal([]byte(msg), &pos)
if err != nil { if err != nil {
break break
} }
if !p.validMove(pos) { if !p.validMove(pos) {
break break
} }
p.Position = pos p.Position = pos
g.broadcast <- p g.broadcast <- p
} }
p.ws.Close() p.ws.Close()