diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake index be0fb315..2af9c685 100644 --- a/cmake/packaging.cmake +++ b/cmake/packaging.cmake @@ -60,7 +60,7 @@ if (NOT LINUXDEPLOY_EXECUTABLE) message(STATUS "Downloading linuxdeploy") set(LINUXDEPLOY_EXECUTABLE ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/linuxdeploy) file(DOWNLOAD - https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage + https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage ${LINUXDEPLOY_EXECUTABLE} INACTIVITY_TIMEOUT 10 LOG ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/download.log @@ -87,4 +87,4 @@ execute_process( endif() -include(CPack) \ No newline at end of file +include(CPack) diff --git a/src/port/mods/PortEnhancements.c b/src/port/mods/PortEnhancements.c index 641ad55f..3c38a290 100644 --- a/src/port/mods/PortEnhancements.c +++ b/src/port/mods/PortEnhancements.c @@ -165,7 +165,21 @@ void OnGameUpdatePost(IEvent* event) { } void OnPlayUpdateEvent(IEvent* event){ + bool debugPaused = CVarGetInteger("gDebugPause", 0); + bool shouldRepause = false; + if (CVarGetInteger("gLToDebugPause", 0)){ + if (gControllerPress[0].button & L_TRIG) { + CVarSetInteger("gDebugPause", !debugPaused); + shouldRepause = debugPaused && CVarGetInteger("gLToFrameAdvance", 0); + } + } else { + CVarSetInteger("gDebugPause", 0); //Unpause if we disable the shortcut + } + event->cancelled = CVarGetInteger("gDebugPause", 0); + if (shouldRepause){ + CVarSetInteger("gDebugPause", 1); + } } void RefillBoostMeter(Player* player) { diff --git a/src/port/ui/ImguiUI.cpp b/src/port/ui/ImguiUI.cpp index 71c294be..829b45ec 100644 --- a/src/port/ui/ImguiUI.cpp +++ b/src/port/ui/ImguiUI.cpp @@ -718,8 +718,11 @@ void DrawDebugMenu() { .tooltip = "Jump to credits at the main menu" }); - if (gGameState == GSTATE_PLAY){ - UIWidgets::CVarCheckbox("Debug Pause", "gDebugPause"); + UIWidgets::CVarCheckbox("Press L to toggle Debug Pause", "gLToDebugPause"); + if (CVarGetInteger("gLToDebugPause", 0)){ + ImGui::Dummy(ImVec2(22.0f, 0.0f)); + ImGui::SameLine(); + UIWidgets::CVarCheckbox("Pressing L again advances one frame instead", "gLToFrameAdvance"); } if (CVarGetInteger(StringHelper::Sprintf("gCheckpoint.%d.Set", gCurrentLevel).c_str(), 0)) {