From 7f8937d5406e4bc5ce8cd309db8be790943b9b94 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 11 Oct 2024 23:52:07 -0400 Subject: [PATCH] Only display the Stage Editor in builds that enable it, and enable it by default (this re-enables the Stage Editor keybind). --- project.hxp | 2 +- source/funkin/ui/debug/DebugMenuSubState.hx | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/project.hxp b/project.hxp index adecc2032..38c5c4933 100644 --- a/project.hxp +++ b/project.hxp @@ -460,7 +460,6 @@ class Project extends HXProject { // Should be false unless explicitly requested. GITHUB_BUILD.apply(this, false); - FEATURE_STAGE_EDITOR.apply(this, false); FEATURE_NEWGROUNDS.apply(this, false); FEATURE_GHOST_TAPPING.apply(this, false); @@ -471,6 +470,7 @@ class Project extends HXProject { FEATURE_FUNKVIS.apply(this, true); FEATURE_PARTIAL_SOUNDS.apply(this, true); FEATURE_VIDEO_PLAYBACK.apply(this, true); + FEATURE_STAGE_EDITOR.apply(this, true); // Should be true on debug builds or if GITHUB_BUILD is enabled. FEATURE_DEBUG_FUNCTIONS.apply(this, isDebug() || GITHUB_BUILD.isEnabled(this)); diff --git a/source/funkin/ui/debug/DebugMenuSubState.hx b/source/funkin/ui/debug/DebugMenuSubState.hx index cc6a2426e..45652095b 100644 --- a/source/funkin/ui/debug/DebugMenuSubState.hx +++ b/source/funkin/ui/debug/DebugMenuSubState.hx @@ -55,12 +55,14 @@ class DebugMenuSubState extends MusicBeatSubState // Create each menu item. // Call onMenuChange when the first item is created to move the camera . #if FEATURE_CHART_EDITOR - onMenuChange(createItem("CHART EDITOR", openChartEditor)); + createItem("CHART EDITOR", openChartEditor); + #end + createItem("ANIMATION EDITOR", openAnimationEditor); + #if FEATURE_STAGE_EDITOR + createItem("STAGE EDITOR", openStageEditor); #end // createItem("Input Offset Testing", openInputOffsetTesting); - createItem("CHARACTER SELECT", openCharSelect, true); - createItem("ANIMATION EDITOR", openAnimationEditor); - createItem("STAGE EDITOR", openStageEditor); + // createItem("CHARACTER SELECT", openCharSelect, true); // createItem("TEST STICKERS", testStickers); #if sys createItem("OPEN CRASH LOG FOLDER", openLogFolder);