From 908372d2964ffa6351bfbc6c61c9fb60944d0042 Mon Sep 17 00:00:00 2001
From: MtH <mth@mth.moe>
Date: Wed, 8 Sep 2021 22:28:30 +0200
Subject: [PATCH] lil oopsies and random cleanup of old shit

---
 source/PlayState.hx  | 30 +++---------------------------
 source/TitleState.hx |  2 +-
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/source/PlayState.hx b/source/PlayState.hx
index 832c6d42a..9c9ca52a5 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -1770,7 +1770,7 @@ class PlayState extends MusicBeatState
 		if (vocalsFinished)
 			return;
 
-		vocals.time = Conductor.songPosition;
+		vocals.time = FlxG.sound.music.time;
 		vocals.play();
 	}
 
@@ -1780,9 +1780,6 @@ class PlayState extends MusicBeatState
 
 	override public function update(elapsed:Float)
 	{
-		// makes the lerp non-dependant on the framerate
-		// FlxG.camera.followLerp = CoolUtil.camLerpShit(0.04);
-
 		#if !debug
 		perfectMode = false;
 		#else
@@ -1873,6 +1870,7 @@ class PlayState extends MusicBeatState
 			paused = true;
 
 			// 1 / 1000 chance for Gitaroo Man easter egg
+			// can this please move to dying it's kinda fucked up that pausing has a 1/1000 chance ur forced to restart
 			if (FlxG.random.bool(0.1))
 			{
 				// gitaroo man easter egg
@@ -1904,9 +1902,6 @@ class PlayState extends MusicBeatState
 		if (FlxG.keys.justPressed.NINE)
 			iconP1.swapOldIcon();
 
-		// FlxG.watch.addQuick('VOL', vocals.amplitudeLeft);
-		// FlxG.watch.addQuick('VOLRight', vocals.amplitudeRight);
-
 		iconP1.setGraphicSize(Std.int(CoolUtil.coolLerp(iconP1.width, 150, 0.15)));
 		iconP2.setGraphicSize(Std.int(CoolUtil.coolLerp(iconP2.width, 150, 0.15)));
 
@@ -1973,24 +1968,9 @@ class PlayState extends MusicBeatState
 					gfSpeed = 2;
 				case 112:
 					gfSpeed = 1;
-				case 163:
-					// FlxG.sound.music.stop();
-					// FlxG.switchState(new TitleState());
 			}
 		}
 
-		if (curSong == 'Bopeebo')
-		{
-			switch (curBeat)
-			{
-				case 128, 129, 130:
-					vocals.volume = 0;
-					// FlxG.sound.music.stop();
-					// FlxG.switchState(new PlayState());
-			}
-		}
-		// better streaming of shit
-
 		if (!inCutscene && !_exiting)
 		{
 			// RESET = Quick Game Over Screen
@@ -2223,6 +2203,7 @@ class PlayState extends MusicBeatState
 			daPos += 4 * (1000 * 60 / daBPM);
 		}
 		Conductor.songPosition = FlxG.sound.music.time = daPos;
+		Conductor.songPosition += Conductor.offset;
 		updateCurStep();
 		resyncVocals();
 	}
@@ -2963,11 +2944,6 @@ class PlayState extends MusicBeatState
 		{
 			resyncVocals();
 		}
-
-		if (dad.curCharacter == 'spooky' && curStep % 4 == 2)
-		{
-			// dad.dance();
-		}
 	}
 
 	var lightningStrikeBeat:Int = 0;
diff --git a/source/TitleState.hx b/source/TitleState.hx
index 7b6e6977a..fa0e8e9eb 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -51,7 +51,7 @@ class TitleState extends MusicBeatState
 	var ngSpr:FlxSprite;
 
 	var curWacky:Array<String> = [];
-	var lastBeat:Int = -1;
+	var lastBeat:Int = 0;
 	var swagShader:ColorSwap;
 	var alphaShader:BuildingShaders;