Map changinbg

scripts/singletons/Transition.gd

@@ -15,6 +15,7 @@ signal fadeUpdate(t:float)
 var fadeType:FadeType = FadeType.NONE
 var fadeDuration:float = 0.4
 var fadeTime:float = 0.0
+var inFade = false
 
 func _enter_tree() -> void:
 	$Overlay.visible = false
@@ -40,17 +41,15 @@ func _process(delta: float) -> void:
 	if t >= 1.0:
 		fadeUpdate.emit(1.0)
 		var cFade = fadeType
-		print("Transition: Fade complete")
 		fadeType = FadeType.NONE
+		$Overlay.color.a = destAlpha
+		inFade = false
 
 		if cFade == FadeType.FADE_OUT:
-			$Overlay.visible = true
 			fadeOutEnd.emit()
 		elif cFade == FadeType.FADE_IN:
-			$Overlay.visible = false
 			fadeInEnd.emit()
 		
-		$Overlay.color.a = destAlpha
 		return
 
 	# TODO: Use curves
@@ -63,17 +62,20 @@ func fade(
 	duration:float = 0.4,
 	color:Color = Color(0, 0, 0, 1),
 ):
-	$Overlay.visible = false
+	if inFade:
+		push_error("Transition: Cannot start a new fade while another is in progress.")
+		return
+
+	$Overlay.visible = true
 	$Overlay.color = color
 	fadeDuration = duration
 	fadeTime = 0
 	fadeType = fade
+	inFade = true
 
 	if fade == FadeType.FADE_IN:
 		fadeInStart.emit()
 		$Overlay.color.a = 0
 	elif fade == FadeType.FADE_OUT:
 		fadeOutStart.emit()
-		$Overlay.color.a = 1
-
-	$Overlay.visible = true
+		$Overlay.color.a = 1