From 039353befcebd73c696504a31b94df1ff6dcd2a6 Mon Sep 17 00:00:00 2001 From: NeeEoo Date: Thu, 6 Jul 2023 11:59:33 +0200 Subject: [PATCH] Small fixes --- source/funkin/backend/system/macros/ScriptsMacro.hx | 1 + source/funkin/editors/charter/Charter.hx | 12 ++++++++++++ source/funkin/game/cutscenes/VideoCutscene.hx | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/source/funkin/backend/system/macros/ScriptsMacro.hx b/source/funkin/backend/system/macros/ScriptsMacro.hx index 87f6d3f8..635939e7 100644 --- a/source/funkin/backend/system/macros/ScriptsMacro.hx +++ b/source/funkin/backend/system/macros/ScriptsMacro.hx @@ -22,6 +22,7 @@ class ScriptsMacro { // OTHER LIBRARIES & STUFF "away3d", "flx3d", #if sys "sys", #end "openfl.net", "funkin.backend.system.net", + "hxcodec.flixel", "hxcodec.openfl", "hxcodec.lime", // BASE HAXE "DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting" ]) diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index a3cfee90..43d2cb9b 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -1,5 +1,6 @@ package funkin.editors.charter; +import funkin.backend.system.framerate.Framerate; import haxe.Json; import flixel.input.keyboard.FlxKey; import flixel.sound.FlxSound; @@ -424,6 +425,10 @@ class Charter extends UIState { add(uiGroup); loadSong(); + + Framerate.fpsCounter.alpha = 0.4; + Framerate.memoryCounter.alpha = 0.4; + Framerate.codenameBuildField.alpha = 0.4; } var instPath:String; @@ -1077,6 +1082,13 @@ class Charter extends UIState { undoList.insert(0, v); } + override function destroy() { + Framerate.fpsCounter.alpha = 1; + Framerate.memoryCounter.alpha = 1; + Framerate.codenameBuildField.alpha = 1; + super.destroy(); + } + inline function _chart_playtest(_) playtestChart(0, false); inline function _chart_playtest_here(_) diff --git a/source/funkin/game/cutscenes/VideoCutscene.hx b/source/funkin/game/cutscenes/VideoCutscene.hx index 2bf8ff90..301cd9d3 100644 --- a/source/funkin/game/cutscenes/VideoCutscene.hx +++ b/source/funkin/game/cutscenes/VideoCutscene.hx @@ -16,7 +16,7 @@ import hxcodec.flixel.FlxVideo; * Substate made for video cutscenes. To use it in a scripted cutscene, call `startVideo`. */ class VideoCutscene extends Cutscene { - public static var curVideo:Int = 0; + private static var curVideo:Int = 0; // internal for zip videos var path:String; var localPath:String;