Merge pull request #3496 from ikemen-engine/fix2

fix: storyboard fading regression

Author: K4thos

src/motif.go

@@ -5347,7 +5347,7 @@ func (hi *MotifHiscore) step(m *Motif) {
 			(!sys.gameRunning && sys.motif.AttractMode.Enabled && sys.credits > 0)
 		if cancel || (!hi.input && hi.counter == hi.endTime) {
 			if !hi.noFade {
-				startFadeOut(m.HiscoreInfo.FadeOut.FadeData, m.fadeOut, cancel, m.fadePolicy)
+				startFadeOut(m.HiscoreInfo.FadeOut.FadeData, m.fadeOut, false, m.fadePolicy)
 			}
 			hi.endTimer = hi.counter + m.fadeOut.timeRemaining
 		}
@@ -6258,7 +6258,7 @@ func (vi *MotifVictory) step(m *Motif) {
 		timeUp := vi.lineFullyRendered && vi.counter >= m.VictoryScreen.Time
 
 		if userInterrupt || timeUp {
-			startFadeOut(m.VictoryScreen.FadeOut.FadeData, m.fadeOut, userInterrupt, m.fadePolicy)
+			startFadeOut(m.VictoryScreen.FadeOut.FadeData, m.fadeOut, false, m.fadePolicy)
 			vi.endTimer = vi.counter + m.fadeOut.timeRemaining
 			//fmt.Printf("[Victory] Starting fadeout: counter=%d time=%d endTimer=%d userInterrupt=%v timeUp=%v\n", vi.counter, m.VictoryScreen.Time, vi.endTimer, userInterrupt, timeUp)
 		}
@@ -6757,7 +6757,7 @@ func (wi *MotifWin) step(m *Motif) {
 	if wi.endTimer == -1 {
 		cancel := sys.esc || sys.uiRawInput(wi.keyCancel, -1)
 		if cancel || wi.counter == wi.time {
-			startFadeOut(wi.fadeOut, m.fadeOut, cancel, m.fadePolicy)
+			startFadeOut(wi.fadeOut, m.fadeOut, false, m.fadePolicy)
 			wi.endTimer = wi.counter + m.fadeOut.timeRemaining
 		}
 	}

src/rect.go

@@ -77,6 +77,12 @@ func (fa *Fade) draw() {
 	}
 }
 
+// True while the fade still has progression remaining.
+// Use this for transition/policy logic, not for drawing.
+func (fa *Fade) isTransitioning() bool {
+	return fa != nil && fa.active && fa.timeRemaining > 0 && fa.time > 0
+}
+
 func (fa *Fade) isActive() bool {
 	return fa != nil && fa.active && fa.timeRemaining >= 0 && fa.time > 0
 }
@@ -117,7 +123,7 @@ func startFadeOut(tmpl *Fade, dest *Fade, overrideBlack bool, policy FadeStartPo
 
 	// FadeStop semantics:
 	// If this is an explicit user interruption OR a fade-in is active, cut immediately.
-	if policy == FadeStop && (overrideBlack || (fi != nil && fi.isActive())) {
+	if policy == FadeStop && (overrideBlack || (fi != nil && fi.isTransitioning())) {
 		if fi != nil {
 			fi.reset()
 		}
@@ -134,7 +140,7 @@ func startFadeOut(tmpl *Fade, dest *Fade, overrideBlack bool, policy FadeStartPo
 	}
 
 	// If no fade-in is active, all policies behave the same here: start now.
-	if fi == nil || !fi.isActive() {
+	if fi == nil || !fi.isTransitioning() {
 		startFresh()
 		return
 	}