Skip to content

Commit

Permalink
Fixed infinite rounds bug.
Browse files Browse the repository at this point in the history
  • Loading branch information
Windblade-GR01 committed Mar 4, 2019
1 parent 7de4263 commit 3c86033
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
3 changes: 0 additions & 3 deletions get.cmd
Expand Up @@ -10,8 +10,5 @@ go get -u github.com/faiface/beep
go get -u github.com/hajimehoshi/oto
go get -u github.com/hajimehoshi/go-mp3
go get -u github.com/pkg/errors


go get -u github.com/jfreymuth/oggvorbis
go get -u github.com/mewkiz/flac
pause
13 changes: 2 additions & 11 deletions src/char.go
Expand Up @@ -2354,11 +2354,7 @@ func (c *Char) leftEdge() float32 {
return sys.cam.ScreenPos[0] / c.localscl
}
func (c *Char) lose() bool {
if c.roundState() > 2 {
return sys.winTeam != c.teamside
} else {
return false
}
return sys.winTeam == 1^c.teamside
}
func (c *Char) loseKO() bool {
return c.lose() && sys.finish == FT_KO
Expand Down Expand Up @@ -2568,11 +2564,7 @@ func (c *Char) win() bool {
if c.teamside >= 2 {
return false
}
if c.roundState() > 2 {
return sys.winTeam == c.playerNo&1
} else {
return false
}
return sys.winTeam == c.playerNo&1
}
func (c *Char) winKO() bool {
return c.win() && sys.finish == FT_KO
Expand Down Expand Up @@ -2667,7 +2659,6 @@ func (c *Char) furimuki() {
}
}
}

func (c *Char) stateChange1(no int32, pn int) bool {
if sys.changeStateNest >= 2500 {
sys.errLog.Printf("2500 loops: %v, %v -> %v -> %v\n",
Expand Down

0 comments on commit 3c86033

Please sign in to comment.