Commit: d20c9853a03b3c0a088e7d03b119d8761835d523 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: d20c9853a03b3c0a088e7d03b119d8761835d523 (tree)
• Zeit: 2019-01-26 09:28:26
• Autor: suehiro <supersuehiro@user...>
• Commiter: suehiro

Log Message

さっきの修正では全く直っていなかった

Ändern Zusammenfassung

• modified: src/camera.go
• modified: src/system.go

Diff

--- a/src/camera.go
+++ b/src/camera.go
@@ -82,9 +82,14 @@ func (c *Camera) Update(scl, x, y float32) {
 	c.Pos[0] = x
 	c.Pos[1] = y
 }
-func (c *Camera) ScaleBound(scl float32) float32 {
+func (c *Camera) ScaleBound(scl, sclmul float32) float32 {
 	if c.ZoomEnable {
-		return MaxF(c.MinScale, MinF(c.ZoomMax, scl))
+		if sys.debugPaused() {
+			sclmul = 1
+		} else if sys.turbo < 1 {
+			sclmul = Pow(sclmul, sys.turbo)
+		}
+		return MaxF(c.MinScale, MinF(c.ZoomMax, scl*sclmul))
 	}
 	return 1
 }
@@ -128,7 +133,9 @@ func (c *Camera) action(x, y *float32, leftest, rightest, lowest, highest,
 			vx += vel
 		}
 	}
-	if !sys.debugPaused() {
+	if sys.debugPaused() {
+		vx = 0
+	} else {
 		vx *= MinF(1, sys.turbo)
 	}
 	if vx < 0 {

--- a/src/system.go
+++ b/src/system.go
@@ -1530,10 +1530,7 @@ func (s *System) fight() (reload bool) {
 				break
 			}
 		}
-		if s.turbo < 1 && !s.debugPaused() {
-			sclmul = Pow(sclmul, s.turbo)
-		}
-		scl = s.cam.ScaleBound(scl * sclmul)
+		scl = s.cam.ScaleBound(scl, sclmul)
 		tmp := (float32(s.gameWidth) / 2) / scl
 		if AbsF((l+r)-(newx-x)*2) >= tmp/2 {
 			tmp = MaxF(0, MinF(tmp, MaxF((newx-x)-l, r-(newx-x))))