Merge remote-tracking branch 'upstream/main'

assets/data/scripts/pixel.hx

@@ -162,16 +162,18 @@ function postUpdate(elapsed) {
 	if (enableCameraHacks) {
 		for(p in strumLines)
 			p.notes.forEach(function(n) {
+				if(n.isSustainNote) return; // hacky fix for hold
 				n.y -= n.y % daPixelZoom;
 				n.x -= n.x % daPixelZoom;
 			});
 	}
 
+	var zoom = 1 / daPixelZoom / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
 	for(e in pixellyCameras) {
 		if (!e.exists) continue;
-		e.zoom = 1 / daPixelZoom / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
+		e.zoom = zoom;
 	}
 	for(e in pixellyShaders) {
-		e.pixelZoom = 1 / daPixelZoom / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
+		e.pixelZoom = zoom;
 	}
 }

assets/data/scripts/week6-pause.hx

@@ -73,7 +73,8 @@ function confText(text) {
 }
 
 function destroy() {
-	FlxG.cameras.remove(pauseCam);
+	if(FlxG.cameras.list.contains(pauseCam))
+		FlxG.cameras.remove(pauseCam);
 }
 
 var canDoShit = true;

source/funkin/backend/utils/FunkinParentDisabler.hx

@@ -32,8 +32,8 @@ class FunkinParentDisabler extends FlxBasic {
 			FlxTimer.globalManager._timers = [];
 
 			// cameras
-			__cameras = [for(c in FlxG.cameras.list) if (c.active) c];
-			for(c in __cameras) c.active = false;
+			__cameras = [for(c in FlxG.cameras.list) if (!c.paused) c];
+			for(c in __cameras) c.paused = true;
 
 			// sounds
 			__sounds = [for(s in FlxG.sound.list) if (s.playing) s];
@@ -41,9 +41,6 @@ class FunkinParentDisabler extends FlxBasic {
 		}
 	}
 
-	public override function update(elapsed:Float) {
-		@:privateAccess for(c in __cameras) c.updateFlashSpritePosition();
-	}
 	public override function draw() {}
 
 	public function reset() {
@@ -63,7 +60,7 @@ class FunkinParentDisabler extends FlxBasic {
 				for(t in __tweens) FlxTween.globalManager._tweens.push(t);
 				for(t in __timers) FlxTimer.globalManager._timers.push(t);
 			}
-			for(c in __cameras) c.active = true;
+			for(c in __cameras) c.paused = false;
 			for(s in __sounds) s.play();
 		}
 	}