only one pending request per player per game

internal/math/vec.go

@@ -24,3 +24,21 @@ func (v *Vec) UnmarshalJSON(b []byte) error {
 }
 
 func (v Vec) Add(v2 Vec) Vec { return Vec{v.X + v2.X, v.Y + v2.Y} }
+
+func (v Vec) Unit() Vec {
+	var out Vec
+	switch {
+	case v.X < 0:
+		out.X = -1
+	case v.X > 0:
+		out.X = 1
+	}
+
+	switch {
+	case v.Y < 0:
+		out.Y = -1
+	case v.Y > 0:
+		out.Y = 1
+	}
+	return out
+}

internal/server/session.go

@@ -86,7 +86,7 @@ func (sn *session) read() {
 			var req wire.Request
 			if err := json.Unmarshal(b, &req); err != nil {
 				sn.Error("unable to parse request: %v", err)
-				sn.outbox <- wire.ErrorResponse(0, "unable to parse request: %v", err)
+				sn.outbox <- wire.ErrorResponse(req.Seq, "unable to parse request: %v", err)
 				break
 			}
 			sn.Info("received message of type %T", req.Body)

internal/server/sim/player.go

@@ -12,7 +12,7 @@ type player struct {
 	*room
 	name    string
 	outbox  chan wire.Response
-	pending []Request
+	pending *Request
 	avatar  *entity
 }
 
@@ -70,14 +70,13 @@ func (s *SpawnPlayer) exec(r *room, p *player, seq int) result {
 			behavior: doNothing{},
 		}
 		p := &player{
-			Log:     r.Log.Child("players").Child(s.Name),
+			Log:    r.Log.Child("players").Child(s.Name),
-			room:    r,
+			room:   r,
-			name:    s.Name,
+			name:   s.Name,
-			outbox:  s.Outbox,
+			outbox: s.Outbox,
-			pending: make([]Request, 0, 32),
+			avatar: avatar,
-			avatar:  avatar,
 		}
-		p.pending = append(p.pending, Request{Seq: seq, From: s.Name, Wants: s})
+		p.pending = &Request{Seq: seq, From: s.Name, Wants: s}
 		r.players[s.Name] = p
 		r.tiles[0].here = p.avatar
 		s.queued = true

internal/server/sim/room.go

@@ -19,19 +19,22 @@ type room struct {
 
 func (r *room) update(dt time.Duration) {
 	for _, p := range r.players {
-		for _, req := range p.pending {
+		if p.pending == nil {
-			res := req.Wants.exec(r, p, req.Seq)
+			continue
-			p.outbox <- wire.Response{Re: req.Seq, Body: res.reply}
+		}
-			if res.announce != nil {
+		req := p.pending
-				for _, p2 := range r.players {
+		p.pending = nil
-					if p2 == p {
+
-						continue
+		res := req.Wants.exec(r, p, req.Seq)
-					}
+		p.outbox <- wire.Response{Re: req.Seq, Body: res.reply}
-					p2.outbox <- wire.Response{Body: res.announce}
+		if res.announce != nil {
+			for _, p2 := range r.players {
+				if p2 == p {
+					continue
 				}
+				p2.outbox <- wire.Response{Body: res.announce}
 			}
 		}
-		p.pending = p.pending[0:0]
 	}
 
 	for _, t := range r.tiles {

internal/server/sim/world.go

@@ -78,7 +78,11 @@ func (w *World) Run(hz int) {
 				w.Error("received non login request of type %T from unknown player %q", req.Wants, req.From)
 			}
 
-			p.pending = append(p.pending, req)
+			if p.pending == nil {
+				p.pending = &req
+			} else {
+				p.outbox <- wire.ErrorResponse(req.Seq, "you already have a request for this frame")
+			}
 
 		case <-ticker.C:
 			w.tick(time.Since(lastTick))