diff --git a/runtime/launcher/launcher.cpp b/runtime/launcher/launcher.cpp index bd907855..440e2f34 100644 --- a/runtime/launcher/launcher.cpp +++ b/runtime/launcher/launcher.cpp @@ -310,7 +310,7 @@ struct LauncherModel { bool spu_hq=false, widescreen=false, ws_eligible=true, skip_launcher=false, show_skip_modal=false; int texture_filter=0, crt=0, aspect_index=0, window_width=1280; int p1_dev_index=1, p2_dev_index=0, p1_mode=0, p2_mode=0, deadzone_pct=37; - bool allow_hybrid=true, mode_selectable=true, lang_menu=false; + bool allow_hybrid=true, mode_selectable=true, lock_device=false, ws_offered=true, lang_menu=false; int lang_index=0, cfg_player=0; bool mc1_enabled=true, mc2_enabled=true, launch_requested=false, quit_requested=false; std::string bios_path, disc_path, view="dashboard"; @@ -348,8 +348,9 @@ static int winsize_index(int w){int b=1,bd=1<<30;for(int i=0;i2?2:1); m.p2_dev_index = io.has_p2_device ? find_or_add_device_index(dev_opts, io.p2_device) : 0; refresh_player(m, 0, dev_opts); @@ -1000,7 +1006,8 @@ Result run(SDL_Window* window, void* gl_context, setting("Skip FMVs", m.auto_skip_fmv?"On":"Off", ri++, [&](){ m.auto_skip_fmv=!m.auto_skip_fmv; }); setting("Turbo loads", m.turbo_loads?"On":"Off", ri++, [&](){ m.turbo_loads=!m.turbo_loads; }); setting("Fullscreen", m.fullscreen?"On":"Off", ri++, [&](){ m.fullscreen=!m.fullscreen; }); - setting("Widescreen", m.widescreen?"On":"Off", ri++, [&](){ m.aspect_index=(m.aspect_index==1)?0:1; refresh_labels(m); }); + if (m.ws_offered) + setting("Widescreen", m.widescreen?"On":"Off", ri++, [&](){ m.aspect_index=(m.aspect_index==1)?0:1; refresh_labels(m); }); // UI scale cycling: 0.5 0.75 1.0 1.25 1.5 1.75 2.0 static const float kScales[] = {0.5f,0.75f,1.0f,1.25f,1.5f,1.75f,2.0f}; static const int kNumScales = 7; @@ -1184,7 +1191,7 @@ Result run(SDL_Window* window, void* gl_context, io.language = game.languages[m.lang_index].code; io.has_language = true; } - io.uiscale = m.uiscale; io.has_uiscale = true; + // io.uiscale = m.uiscale; io.has_uiscale = true; } return result; diff --git a/runtime/launcher/launcher.h b/runtime/launcher/launcher.h index 7be831ae..268cbf68 100644 --- a/runtime/launcher/launcher.h +++ b/runtime/launcher/launcher.h @@ -36,6 +36,9 @@ struct GameInfo { bool lock_mode = false; int locked_mode = 2; // PAD_MODE_DIGITAL + bool lock_device = false; // true hides the Player controller-card device selector + bool ws_offered = true; // false hides the widescreen toggle + clamps to 4:3 + struct Language { std::string code; std::string label; }; std::vector languages; };