Commit: a17a9afea827b0b947846a0e8a3ccae8e73688b3 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: a17a9afea827b0b947846a0e8a3ccae8e73688b3 (tree)
• Time: 2019-01-26 08:16:38
• Author: suehiro <supersuehiro@user...>
• Commiter: suehiro

Log Message

デバッグキーでポーズがかかるタイミングをMugenと同じに修正。その他バグ修正

Change Summary

• modified: get.sh
• modified: src/char.go
• modified: src/system.go

Incremental Difference

--- a/get.sh
+++ b/get.sh
@@ -8,3 +8,4 @@ go get -u github.com/timshannon/go-openal/openal
 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

--- a/src/char.go
+++ b/src/char.go
@@ -2354,7 +2354,7 @@ func (c *Char) leftEdge() float32 {
 	return sys.cam.ScreenPos[0] / c.localscl
 }
 func (c *Char) lose() bool {
-	return sys.winTeam == ^c.teamside
+	return sys.winTeam == 1^c.teamside
 }
 func (c *Char) loseKO() bool {
 	return c.lose() && sys.finish == FT_KO
@@ -4091,8 +4091,8 @@ func (c *Char) action() {
 	c.acttmp = -int8(Btoi(p)) * 2
 	c.unsetSCF(SCF_guard)
 	if !(c.scf(SCF_ko) || c.ctrlOver()) &&
-		(c.scf(SCF_ctrl) || c.ss.no == 52 || c.inGuardState()) &&
-		c.ss.moveType == MT_I && c.cmd != nil &&
+		((c.scf(SCF_ctrl) || c.ss.no == 52) &&
+			c.ss.moveType == MT_I || c.inGuardState()) && c.cmd != nil &&
 		(sys.autoguard[c.playerNo] || c.cmd[0].Buffer.B > 0) &&
 		(c.ss.stateType == ST_S && !c.sf(CSF_nostandguard) ||
 			c.ss.stateType == ST_C && !c.sf(CSF_nocrouchguard) ||
@@ -5417,7 +5417,6 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 				cr += c.pos[0] * c.localscl
 				if gl < cr && cl < gr && (contact > 0 ||
 					getter.clsnCheck(c, false, false)) {
-					drawposOvrd := true
 					getter.pushed, c.pushed = true, true
 					tmp := getter.distX(c, getter)
 					if tmp == 0 {
@@ -5436,7 +5435,6 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 					}
 					if getter.sf(CSF_screenbound) {
 						getter.pos[0] = MaxF(gxmin/getter.localscl, MinF(gxmax/getter.localscl, getter.pos[0]))
-						drawposOvrd = false
 					}
 					if c.sf(CSF_screenbound) {
 						l, r := c.getEdge(c.edge[0], true), -c.getEdge(c.edge[1], true)
@@ -5449,9 +5447,7 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 						getter.pos[0]))
 					c.pos[0] = MaxF(sys.stage.leftbound/c.localscl, MinF(sys.stage.rightbound/c.localscl,
 						c.pos[0]))
-					if drawposOvrd {
-						getter.drawPos[0], c.drawPos[0] = getter.pos[0], c.pos[0]
-					}
+					getter.drawPos[0], c.drawPos[0] = getter.pos[0], c.pos[0]
 				}
 			}
 		}

--- a/src/system.go
+++ b/src/system.go
@@ -642,10 +642,11 @@ func (s *System) nextRound() {
 	}
 }
 func (s *System) tickFrame() bool {
-	return s.oldTickCount < s.tickCount
+	return (!s.paused || s.step) && s.oldTickCount < s.tickCount
 }
 func (s *System) tickNextFrame() bool {
-	return int(s.tickCountF+s.nextAddTime) > s.tickCount
+	return int(s.tickCountF+s.nextAddTime) > s.tickCount &&
+		!s.paused || s.step || s.oldTickCount >= s.tickCount
 }
 func (s *System) tickInterpola() float32 {
 	if s.tickNextFrame() {
@@ -654,6 +655,10 @@ func (s *System) tickInterpola() float32 {
 	return s.tickCountF - s.lastTick + s.nextAddTime
 }
 func (s *System) addFrameTime(t float32) bool {
+	if s.paused && !s.step && s.oldTickCount < s.tickCount {
+		s.oldNextAddTime = 0
+		return true
+	}
 	s.oldTickCount = s.tickCount
 	if int(s.tickCountF) > s.tickCount {
 		s.tickCount++
@@ -1085,11 +1090,8 @@ func (s *System) action(x, y *float32, scl float32) (leftest, rightest,
 			s.intro = 0
 		}
 	}
-	if s.turbo == 0 || s.tickNextFrame() {
+	if s.tickNextFrame() {
 		spd := s.accel
-		if s.paused && !s.step {
-			spd = 0
-		}
 		_else := s.sf(GSF_nokoslow) || s.time == 0
 		if !_else {
 			slowt := -(s.lifebar.ro.over_hittime + (s.lifebar.ro.slow_time+3)>>2)