From 60c4367896b42a637cac05b16544e2a857972a42 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Tue, 2 Feb 2021 02:35:35 -0500
Subject: [PATCH] lil dating sim things

---
 source/DialogueBox.hx | 2 +-
 source/PlayState.hx   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/source/DialogueBox.hx b/source/DialogueBox.hx
index 2dbd53e2d..f8dbfe647 100644
--- a/source/DialogueBox.hx
+++ b/source/DialogueBox.hx
@@ -130,7 +130,7 @@ class DialogueBox extends FlxSpriteGroup
 			dialogueStarted = true;
 		}
 
-		if (FlxG.keys.justPressed.SPACE)
+		if (FlxG.keys.justPressed.ANY)
 		{
 			remove(dialogue);
 
diff --git a/source/PlayState.hx b/source/PlayState.hx
index b669a034a..94e397790 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -116,6 +116,8 @@ class PlayState extends MusicBeatState
 	// how big to stretch the pixel art assets
 	public static var daPixelZoom:Float = 6;
 
+	var inCutscene:Bool = false;
+
 	override public function create()
 	{
 		// var gameCam:FlxCamera = FlxG.camera;
@@ -753,6 +755,7 @@ class PlayState extends MusicBeatState
 			{
 				if (dialogueBox != null)
 				{
+					inCutscene = true;
 					add(dialogueBox);
 				}
 				else
@@ -768,6 +771,8 @@ class PlayState extends MusicBeatState
 
 	function startCountdown():Void
 	{
+		inCutscene = false;
+
 		generateStaticArrows(0);
 		generateStaticArrows(1);
 
@@ -1512,7 +1517,8 @@ class PlayState extends MusicBeatState
 			});
 		}
 
-		keyShit();
+		if (!inCutscene)
+			keyShit();
 
 		// if (FlxG.keys.justPressed.ONE)
 		// endSong();