|
|
@ -50,7 +50,7 @@ func (p *player) start(c chan Request, conn *websocket.Conn, r *room) {
|
|
|
|
welcome.Players[p.name] = wp
|
|
|
|
welcome.Players[p.name] = wp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
p.Info("sending welcome to outbox")
|
|
|
|
p.Info("sending welcome to outbox")
|
|
|
|
p.outbox <- wire.Response{Re: 1, Body: welcome}
|
|
|
|
p.send(wire.Response{Re: 1, Body: welcome})
|
|
|
|
p.Info("sent welcome, starting loops")
|
|
|
|
p.Info("sent welcome, starting loops")
|
|
|
|
p.stop = make(chan bool, 1)
|
|
|
|
p.stop = make(chan bool, 1)
|
|
|
|
go p.readLoop(c, conn)
|
|
|
|
go p.readLoop(c, conn)
|
|
|
@ -115,6 +115,20 @@ func (p *player) runLoop(conn *websocket.Conn) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (p *player) send(res wire.Response) bool {
|
|
|
|
|
|
|
|
select {
|
|
|
|
|
|
|
|
case p.outbox <- res:
|
|
|
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
|
|
select {
|
|
|
|
|
|
|
|
case <-p.outbox:
|
|
|
|
|
|
|
|
return p.send(res)
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
|
|
return false
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func sendResponse(conn *websocket.Conn, res wire.Response) error {
|
|
|
|
func sendResponse(conn *websocket.Conn, res wire.Response) error {
|
|
|
|
payload, err := json.Marshal(res)
|
|
|
|
payload, err := json.Marshal(res)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|