diff options
Diffstat (limited to 'uis/server.go')
| -rw-r--r-- | uis/server.go | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/uis/server.go b/uis/server.go index f4e51e8..220699c 100644 --- a/uis/server.go +++ b/uis/server.go @@ -91,13 +91,12 @@ func (msg sMsg) String() string { } type player struct { - name string - score logic.Score + logic.Player client *client } func (p player) String() string { - return p.name + return p.Name } type client struct { @@ -149,7 +148,7 @@ func (c *client) getBest() ([]player, int) { best := []player{} max := 0 for _, p := range c.players { - t := p.score.Score() + t := p.Score.Score() if t > max { best = []player{p} max = t @@ -170,7 +169,7 @@ func (c *client) round(round int, wg *sync.WaitGroup) { cmd := logic.Cmd{} var err error rerolls := 0 - err = c.send(sMsg{94, []interface{}{round, p.name, dice}}) + err = c.send(sMsg{94, []interface{}{round, p.Name, dice}}) if err != nil { fin = true } @@ -189,7 +188,7 @@ func (c *client) round(round int, wg *sync.WaitGroup) { msg.Payload = logic.CmdHelp(cmd.Argv[0]) case "p": msg.Response = 12 - msg.Payload = p.score + msg.Payload = p.Score case "d": msg.Response = 13 msg.Payload = dice @@ -198,23 +197,23 @@ func (c *client) round(round int, wg *sync.WaitGroup) { err = errors.New("Quit") c.sock.Close() case "i": - i, err := p.score.Insert(dice, cmd.Argv[0]) + i, err := p.Score.Insert(dice, cmd.Argv[0]) if err != nil { msg.Response = 31 msg.Payload = err } else { msg.Response = 14 - msg.Payload = []interface{}{cmd, i, p.score} + msg.Payload = []interface{}{cmd, i, p.Score} fin = true } case "c": - err := p.score.Cancel(cmd.Argv[0]) + err := p.Score.Cancel(cmd.Argv[0]) if err != nil { msg.Response = 32 msg.Payload = err } else { msg.Response = 15 - msg.Payload = []interface{}{cmd, p.score} + msg.Payload = []interface{}{cmd, p.Score} fin = true } case "r": @@ -241,7 +240,7 @@ func (c *client) round(round int, wg *sync.WaitGroup) { if err != nil { msg = sMsg{96, err} } else { - msg = sMsg{95, []interface{}{p.name, msg}} + msg = sMsg{95, []interface{}{p.Name, msg}} } c.results <- msg } @@ -263,7 +262,7 @@ func (s session) String() (ret string) { names := make([]string, 0, s.maxPlayers) for _, c := range s.clients { for _, p := range c.players { - names = append(names, p.name) + names = append(names, p.Name) } } return fmt.Sprintf("%s%v", ret, names) @@ -283,7 +282,7 @@ func (s *session) terminate(reason sMsg) { func (s *session) addClient(c *client) { newNames := make([]string, 0, len(c.players)) for _, n := range c.players { - newNames = append(newNames, n.name) + newNames = append(newNames, n.Name) } okClients := make([]*client, 0, len(c.players)) for _, other := range s.clients { @@ -324,7 +323,7 @@ func (s *session) play() { // collect broken clients if res.Response == 96 { badClients[c] = true - res = sMsg{96, []interface{}{p.name, res.Payload}} + res = sMsg{96, []interface{}{p.Name, res.Payload}} } for j, c2 := range s.clients { if i != j { @@ -424,7 +423,7 @@ func (s *Server) Serve() error { helo.Players = line[1:] } for _, name := range helo.Players { - c.players = append(c.players, player{name, logic.NewScore(), &c}) + c.players = append(c.players, player{logic.Player{name, logic.NewScore()}, &c}) } c.results = make(chan sMsg, len(c.players)) |