mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-03 10:01:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into randomizer

Browse Source 
# Conflicts:
#	files.cmake
#	src/m_Do/m_Do_main.cpp
This commit is contained in:
CraftyBoss
2026-05-10 23:14:50 -07:00
parent 04d9640eff 764fc0b96f
commit 5e69c7bdce
19 changed files with 440 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_Do/m_Do_main.cpp
+14 -4
View File
@@ -90,6 +90,10 @@
#include <TargetConditionals.h>
#endif
#if DUSK_ENABLE_SENTRY_NATIVE
#include "dusk/ui/reporting.hpp"
#endif
#if RANDOMIZER_ONLY
#include "dusk/randomizer/generator/randomizer.hpp"
#include "dusk/randomizer/generator/test/test.hpp"
@@ -709,7 +713,7 @@ int game_main(int argc, char* argv[]) {
dusk::config::LoadFromUserPreferences();
ApplyCVarOverrides(parsed_arg_options["cvar"]);
dusk::InitializeCrashReporting();
dusk::crash_reporting::initialize();
EnsureInitialPipelineCache(dusk::ConfigPath);
// TODO: How to handle this?
//PADSetDefaultMapping(&defaultPadMapping, PAD_TYPE_STANDARD);
@@ -763,7 +767,7 @@ int game_main(int argc, char* argv[]) {
// Run ImGui UI loop if Aurora couldn't initialize a backend
if (auroraInfo.backend == BACKEND_NULL) {
launchUILoop();
dusk::ShutdownCrashReporting();
dusk::crash_reporting::shutdown();
dusk::ShutdownFileLogging();
fflush(stdout);
fflush(stderr);
@@ -841,7 +845,7 @@ int game_main(int argc, char* argv[]) {
// pre game launch ui main loop
if (!launchUILoop()) {
dusk::ShutdownCrashReporting();
dusk::crash_reporting::shutdown();
dusk::ShutdownFileLogging();
fflush(stdout);
fflush(stderr);
@@ -872,6 +876,12 @@ int game_main(int argc, char* argv[]) {
dusk::IsGameLaunched = true;
}
#if DUSK_ENABLE_SENTRY_NATIVE
if (dusk::crash_reporting::get_consent() == dusk::crash_reporting::Consent::Unknown) {
dusk::ui::push_document(std::make_unique<dusk::ui::CrashReportWindow>());
}
#endif
if (!dusk::getSettings().backend.wasPresetChosen) {
dusk::ui::push_document(std::make_unique<dusk::ui::PresetWindow>());
}
@@ -903,7 +913,7 @@ int game_main(int argc, char* argv[]) {
dusk::MoviePlayerShutdown();
dusk::ShutdownCrashReporting();
dusk::crash_reporting::shutdown();
dusk::ShutdownFileLogging();
fflush(stdout);
fflush(stderr);