From 92a0c367b7c097c6c69ce3cc13923854bf1f2667 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Mon, 31 Jul 2023 13:31:17 -0400
Subject: [PATCH] Typo fixes
---
source/funkin/Conductor.hx | 1 -
source/funkin/play/PlayState.hx | 8 ++++----
source/funkin/util/Constants.hx | 3 +++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/source/funkin/Conductor.hx b/source/funkin/Conductor.hx
index 4b1261d4b..f909f54c2 100644
--- a/source/funkin/Conductor.hx
+++ b/source/funkin/Conductor.hx
@@ -3,7 +3,6 @@ package funkin;
import funkin.util.Constants;
import flixel.util.FlxSignal;
import flixel.math.FlxMath;
-import funkin.SongLoad.SwagSong;
import funkin.play.song.Song.SongDifficulty;
import funkin.play.song.SongData.SongTimeChange;
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index df085a9b9..80a61e791 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -1640,9 +1640,9 @@ class PlayState extends MusicBeatState
{
if (note == null) continue;
- var hitWindowStart = note.strumTime - Conductor.HIT_WINDOW_MS;
+ var hitWindowStart = note.strumTime - Constants.HIT_WINDOW_MS;
var hitWindowCenter = note.strumTime;
- var hitWindowEnd = note.strumTime + Conductor.HIT_WINDOW_MS;
+ var hitWindowEnd = note.strumTime + Constants.HIT_WINDOW_MS;
if (Conductor.songPosition > hitWindowEnd)
{
@@ -1717,9 +1717,9 @@ class PlayState extends MusicBeatState
{
if (note == null || note.hasBeenHit) continue;
- var hitWindowStart = note.strumTime - Conductor.HIT_WINDOW_MS;
+ var hitWindowStart = note.strumTime - Constants.HIT_WINDOW_MS;
var hitWindowCenter = note.strumTime;
- var hitWindowEnd = note.strumTime + Conductor.HIT_WINDOW_MS;
+ var hitWindowEnd = note.strumTime + Constants.HIT_WINDOW_MS;
if (Conductor.songPosition > hitWindowEnd)
{
diff --git a/source/funkin/util/Constants.hx b/source/funkin/util/Constants.hx
index 5b9288d4d..1090d31c5 100644
--- a/source/funkin/util/Constants.hx
+++ b/source/funkin/util/Constants.hx
@@ -205,6 +205,9 @@ class Constants
* TIMING
*/
// ==============================
+ public static final HIT_WINDOW_MS:Int = 160;
+
+ public static final PIXELS_PER_MS:Float = 0.45;
/**
* The number of seconds in a minute.