pull doCommand call out of UpdateState

This commit is contained in:
Luke Meyers 2020-02-09 08:39:30 -08:00
parent 6eb0e55dcc
commit 6a9943993c
2 changed files with 5 additions and 6 deletions

View File

@ -32,7 +32,10 @@ func CommandLoop(w *pixelgl.Window, s State, stateCA chan<- State) {
w.SetClosed(true) w.SetClosed(true)
return return
case w.JustPressed(pixelgl.KeyEnter) || w.Pressed(pixelgl.KeySpace) || true: case w.JustPressed(pixelgl.KeyEnter) || w.Pressed(pixelgl.KeySpace) || true:
s = UpdateState(s, sOld, <-cmdC) for i, cmd := range <-cmdC {
s = doCommand(cmd, s, i)
}
s = UpdateState(s, sOld)
turn++ turn++
if s.GameOver { if s.GameOver {
s = NewState() s = NewState()

View File

@ -42,11 +42,7 @@ type Baton struct {
HolderID int HolderID int
} }
func UpdateState(s State, sOld State, cmds []Command) State { func UpdateState(s State, sOld State) State {
for i, cmd := range cmds {
s = doCommand(cmd, s, i)
}
var winners []int var winners []int
for _, t := range s.Teams { for _, t := range s.Teams {
if r := ActiveRacer(t); r != nil { if r := ActiveRacer(t); r != nil {