From b11bf096870cc1d4b54c7278f01f6c6b437d5d14 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 9 Jan 2024 19:57:33 -0500 Subject: [PATCH] save/load for inputOffsets --- source/funkin/Conductor.hx | 11 +++++++---- source/funkin/ui/debug/latency/LatencyState.hx | 10 +++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/source/funkin/Conductor.hx b/source/funkin/Conductor.hx index 6113baf23..2ca144a2d 100644 --- a/source/funkin/Conductor.hx +++ b/source/funkin/Conductor.hx @@ -6,6 +6,7 @@ import flixel.math.FlxMath; import funkin.play.song.Song.SongDifficulty; import funkin.data.song.SongData.SongTimeChange; import funkin.data.song.SongDataUtils; +import funkin.save.Save; /** * A core class which handles musical timing throughout the game, @@ -209,16 +210,18 @@ class Conductor /** * An offset set by the user to compensate for input lag. */ - public var inputOffset(get, set):Float; + public var inputOffset(get, set):Int; - function get_inputOffset():Float + function get_inputOffset():Int { return Save.get().options.inputOffset; } - function set_inputOffset(value:Float):Float + function set_inputOffset(value:Int):Int { - return Save.get().options.inputOffset = value; + Save.get().options.inputOffset = value; + Save.get().flush(); + return Save.get().options.inputOffset; } /** diff --git a/source/funkin/ui/debug/latency/LatencyState.hx b/source/funkin/ui/debug/latency/LatencyState.hx index ae922612b..84425d4a0 100644 --- a/source/funkin/ui/debug/latency/LatencyState.hx +++ b/source/funkin/ui/debug/latency/LatencyState.hx @@ -200,7 +200,7 @@ class LatencyState extends MusicBeatSubState offsetText.text += "\naverage input offset needed: " + avgOffsetInput; - var multiply:Float = 10; + var multiply:Int = 10; if (FlxG.keys.pressed.SHIFT) multiply = 1; @@ -208,24 +208,24 @@ class LatencyState extends MusicBeatSubState { if (FlxG.keys.justPressed.RIGHT) { - Conductor.instance.instrumentalOffset += 1.0 * multiply; + Conductor.instance.instrumentalOffset += 1 * multiply; } if (FlxG.keys.justPressed.LEFT) { - Conductor.instance.instrumentalOffset -= 1.0 * multiply; + Conductor.instance.instrumentalOffset -= 1 * multiply; } } else { if (FlxG.keys.justPressed.RIGHT) { - Conductor.instance.inputOffset += 1.0 * multiply; + Conductor.instance.inputOffset += 1 * multiply; } if (FlxG.keys.justPressed.LEFT) { - Conductor.instance.inputOffset -= 1.0 * multiply; + Conductor.instance.inputOffset -= 1 * multiply; } }