diff --git a/src/skate3_iso_installer.cpp b/src/skate3_iso_installer.cpp index 01567d0..c0b34bd 100644 --- a/src/skate3_iso_installer.cpp +++ b/src/skate3_iso_installer.cpp @@ -385,7 +385,7 @@ void ShowRexglueIsoInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig r }; new rex::ui::InstallWizardDialog( - drawer, "Skate 3 Setup", + drawer, "Setup", "Game Files", "Skate 3 game files were not found. Select your Xbox 360 ISO to install them.", runtime_paths.game_data_root.string(), std::move(pick_source), std::move(install), [runtime_paths = std::move(runtime_paths), complete = std::move(complete)]() mutable { diff --git a/src/skate3_native_debug_dialog.cpp b/src/skate3_native_debug_dialog.cpp index fe62b15..e807890 100644 --- a/src/skate3_native_debug_dialog.cpp +++ b/src/skate3_native_debug_dialog.cpp @@ -4,6 +4,7 @@ #include #include +#include #include "skate3_native_scene.h" @@ -411,6 +412,15 @@ void RenderModeIndicator::OnDraw(ImGuiIO& io) { if (!REXCVAR_GET(skate3_native_render_mode_indicator)) { return; } + // Pre-runtime (installer wizards) no guest frame exists yet - there is no + // renderer to indicate. + if (rex::ui::Presenter* presenter = imgui_drawer()->presenter()) { + const rex::ui::Presenter::GuestOutputPaintRect rect = + presenter->GetLastGuestOutputPaintRect(); + if (rect.width <= 0 || rect.height <= 0) { + return; + } + } const bool native = rex::graphics::IsNativeGuestOutputActive(); ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x - 10.0f, 10.0f), ImGuiCond_Always, ImVec2(1.0f, 0.0f)); diff --git a/src/skate3_title_update_installer.cpp b/src/skate3_title_update_installer.cpp index 31f8087..e457794 100644 --- a/src/skate3_title_update_installer.cpp +++ b/src/skate3_title_update_installer.cpp @@ -770,7 +770,8 @@ void ShowTitleUpdateInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig const auto game_root = runtime_paths.game_data_root; rex::ui::AcquireWizardDialog::Options options; - options.title = "Skate 3 Title Update"; + options.title = "Setup"; + options.section_label = "Title Update 3"; options.intro = "This build of Skate 3 requires Title Update 3, a free update originally published on " "Xbox Live. It is not part of the game disc."; @@ -785,6 +786,7 @@ void ShowTitleUpdateInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig options.install_working_status = "Installing the title update..."; options.done_status = "Title Update 3 installed."; options.done_button_label = "Start Game"; + options.launching_status = "Starting the game..."; auto fetch = [game_root](std::atomic& copied_bytes, std::atomic& total_bytes, std::string& error) { diff --git a/third_party/rexglue-sdk b/third_party/rexglue-sdk index a8e2840..fc70322 160000 --- a/third_party/rexglue-sdk +++ b/third_party/rexglue-sdk @@ -1 +1 @@ -Subproject commit a8e28405f9bd56924b494012166212189c8948aa +Subproject commit fc70322f3d50ea0833c7894c1d31d9e30e693a05