diff --git a/source/ModchartState.hx b/source/ModchartState.hx index 4e4b9c2..0be6aec 100644 --- a/source/ModchartState.hx +++ b/source/ModchartState.hx @@ -690,10 +690,6 @@ class ModchartState FlxG.camera.setFilters([new ShaderFilter(shaders[shaderIndex])]); });*/ - - objectToLua(lua,PlayState.instance.camHUD); - Lua.setglobal(lua,"fuckyou"); - // default strums for (i in 0...PlayState.strumLineNotes.length) { diff --git a/source/MusicBeatState.hx b/source/MusicBeatState.hx index 29260f8..65b2f7c 100644 --- a/source/MusicBeatState.hx +++ b/source/MusicBeatState.hx @@ -70,7 +70,7 @@ class MusicBeatState extends FlxUIState else skippedFrames++; - if ((cast (Lib.current.getChildAt(0), Main)).getFPSCap != FlxG.save.data.fpsCap) + if ((cast (Lib.current.getChildAt(0), Main)).getFPSCap != FlxG.save.data.fpsCap && FlxG.save.data.fpsCap <= 290) (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); super.update(elapsed); diff --git a/source/Options.hx b/source/Options.hx index 39a6aaa..da7a9c6 100644 --- a/source/Options.hx +++ b/source/Options.hx @@ -329,18 +329,23 @@ class FPSCapOption extends Option override function right():Bool { if (FlxG.save.data.fpsCap >= 290) - FlxG.save.data.fpsCap = 2000; // set it really high lol, I mean. if you hit that cap, it really doesn't do much lol. + { + FlxG.save.data.fpsCap = 800; // set it really high lol, I mean. if you hit that cap, it really doesn't do much lol. + (cast (Lib.current.getChildAt(0), Main)).setFPSCap(290); + } else FlxG.save.data.fpsCap = FlxG.save.data.fpsCap + 10; (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); - OptionsMenu.versionShit.text = "Current FPS Cap: " + FlxG.save.data.fpsCap + " - Description - " + description; + OptionsMenu.versionShit.text = "Current FPS Cap: " + (FlxG.save.data.fpsCap > 290 ? "Unlimited (In Gameplay)" : FlxG.save.data.fpsCap) + " - Description - " + description; return true; } override function left():Bool { - if (FlxG.save.data.fpsCap < 60) + if (FlxG.save.data.fpsCap > 290) + FlxG.save.data.fpsCap = 290; + else if (FlxG.save.data.fpsCap < 60) FlxG.save.data.fpsCap = Application.current.window.displayMode.refreshRate; else FlxG.save.data.fpsCap = FlxG.save.data.fpsCap - 10; diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx index 561d9e9..affb540 100644 --- a/source/PauseSubState.hx +++ b/source/PauseSubState.hx @@ -1,5 +1,6 @@ package; +import openfl.Lib; #if windows import llua.Lua; #end @@ -189,6 +190,8 @@ class PauseSubState extends MusicBeatSubstate PlayState.luaModchart = null; } #end + if (FlxG.save.data.fpsCap > 290) + (cast (Lib.current.getChildAt(0), Main)).setFPSCap(290); FlxG.switchState(new MainMenuState()); } } diff --git a/source/PlayState.hx b/source/PlayState.hx index 6b44356..2539f71 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -216,7 +216,9 @@ class PlayState extends MusicBeatState { instance = this; - + if (FlxG.save.data.fpsCap > 290) + (cast (Lib.current.getChildAt(0), Main)).setFPSCap(800); + if (FlxG.sound.music != null) FlxG.sound.music.stop(); @@ -2316,6 +2318,9 @@ class PlayState extends MusicBeatState if (!loadRep) rep.SaveReplay(); + if (FlxG.save.data.fpsCap > 290) + (cast (Lib.current.getChildAt(0), Main)).setFPSCap(290); + #if windows if (luaModchart != null) {