Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-18 06:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GameDatabase: Add some missing OSD message keys

Browse source
This commit is contained in:
Connor McLaughlin 2022-07-25 17:36:38 +10:00
parent f9846e1e4d
commit a8f5146010
2 changed files with 47 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/analog_controller.cpp
View file

@ -45,7 +45,8 @@ void AnalogController::Reset()
{ {
if (g_settings.controller_disable_analog_mode_forcing) if (g_settings.controller_disable_analog_mode_forcing)
{ {
Host::AddOSDMessage( Host::AddKeyedOSDMessage(
"analog_controller_mode_ignored",
Host::TranslateStdString( Host::TranslateStdString(
"OSDMessage", "Analog mode forcing is disabled by game settings. Controller will start in digital mode."), "OSDMessage", "Analog mode forcing is disabled by game settings. Controller will start in digital mode."),
10.0f); 10.0f);
@ -280,8 +281,7 @@ void AnalogController::UpdateHostVibration()
{ {
// Curve from https://github.com/KrossX/Pokopom/blob/master/Pokopom/Input_XInput.cpp#L210 // Curve from https://github.com/KrossX/Pokopom/blob/master/Pokopom/Input_XInput.cpp#L210
const u8 state = m_motor_state[motor]; const u8 state = m_motor_state[motor];
const double x = const double x = static_cast<double>(std::min<u32>(state + static_cast<u32>(m_rumble_bias), 255));
static_cast<double>(std::min<u32>(state + static_cast<u32>(m_rumble_bias), 255));
const double strength = 0.006474549734772402 * std::pow(x, 3.0) - 1.258165252213538 * std::pow(x, 2.0) + const double strength = 0.006474549734772402 * std::pow(x, 3.0) - 1.258165252213538 * std::pow(x, 2.0) +
156.82454281087692 * x + 3.637978807091713e-11; 156.82454281087692 * x + 3.637978807091713e-11;

60
src/core/game_database.cpp
View file

@ -240,7 +240,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.cpu_execution_mode != CPUExecutionMode::Interpreter) if (display_osd_messages && settings.cpu_execution_mode != CPUExecutionMode::Interpreter)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "CPU interpreter forced by game settings."), Host::AddKeyedOSDMessage("gamedb_force_interpreter",
Host::TranslateStdString("OSDMessage", "CPU interpreter forced by game settings."),
osd_duration); osd_duration);
} }
@ -251,7 +252,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_renderer != GPURenderer::Software) if (display_osd_messages && settings.gpu_renderer != GPURenderer::Software)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "Software renderer forced by game settings."), Host::AddKeyedOSDMessage("gamedb_force_software",
Host::TranslateStdString("OSDMessage", "Software renderer forced by game settings."),
osd_duration); osd_duration);
} }
@ -262,7 +264,9 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_disable_interlacing) if (display_osd_messages && settings.gpu_disable_interlacing)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "Interlacing forced by game settings."), osd_duration); Host::AddKeyedOSDMessage("gamedb_force_interlacing",
Host::TranslateStdString("OSDMessage", "Interlacing forced by game settings."),
osd_duration);
} }
settings.gpu_disable_interlacing = false; settings.gpu_disable_interlacing = false;
@ -272,7 +276,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_true_color) if (display_osd_messages && settings.gpu_true_color)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "True color disabled by game settings."), Host::AddKeyedOSDMessage("gamedb_disable_true_color",
Host::TranslateStdString("OSDMessage", "True color disabled by game settings."),
osd_duration); osd_duration);
} }
@ -283,7 +288,9 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_resolution_scale > 1) if (display_osd_messages && settings.gpu_resolution_scale > 1)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "Upscaling disabled by game settings."), osd_duration); Host::AddKeyedOSDMessage("gamedb_disable_upscaling",
Host::TranslateStdString("OSDMessage", "Upscaling disabled by game settings."),
osd_duration);
} }
settings.gpu_resolution_scale = 1; settings.gpu_resolution_scale = 1;
@ -293,7 +300,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_scaled_dithering) if (display_osd_messages && settings.gpu_scaled_dithering)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "Scaled dithering disabled by game settings."), Host::AddKeyedOSDMessage("gamedb_disable_scaled_dithering",
Host::TranslateStdString("OSDMessage", "Scaled dithering disabled by game settings."),
osd_duration); osd_duration);
} }
@ -305,7 +313,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
if (display_osd_messages && if (display_osd_messages &&
(settings.display_aspect_ratio == DisplayAspectRatio::R16_9 || settings.gpu_widescreen_hack)) (settings.display_aspect_ratio == DisplayAspectRatio::R16_9 || settings.gpu_widescreen_hack))
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "Widescreen disabled by game settings."), Host::AddKeyedOSDMessage("gamedb_disable_widescreen",
Host::TranslateStdString("OSDMessage", "Widescreen disabled by game settings."),
osd_duration); osd_duration);
} }
@ -317,8 +326,9 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_force_ntsc_timings) if (display_osd_messages && settings.gpu_force_ntsc_timings)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "Forcing NTSC Timings disallowed by game settings."), Host::AddKeyedOSDMessage(
osd_duration); "gamedb_disable_force_ntsc_timings",
Host::TranslateStdString("OSDMessage", "Forcing NTSC Timings disallowed by game settings."), osd_duration);
} }
settings.gpu_force_ntsc_timings = false; settings.gpu_force_ntsc_timings = false;
@ -328,8 +338,9 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_pgxp_enable) if (display_osd_messages && settings.gpu_pgxp_enable)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "PGXP geometry correction disabled by game settings."), Host::AddKeyedOSDMessage(
osd_duration); "gamedb_disable_pgxp",
Host::TranslateStdString("OSDMessage", "PGXP geometry correction disabled by game settings."), osd_duration);
} }
settings.gpu_pgxp_enable = false; settings.gpu_pgxp_enable = false;
@ -339,7 +350,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_culling) if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_culling)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "PGXP culling disabled by game settings."), Host::AddKeyedOSDMessage("gamedb_disable_pgxp_culling",
Host::TranslateStdString("OSDMessage", "PGXP culling disabled by game settings."),
osd_duration); osd_duration);
} }
@ -350,8 +362,9 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_texture_correction) if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_texture_correction)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "PGXP texture correction disabled by game settings."), Host::AddKeyedOSDMessage(
osd_duration); "gamedb_disable_pgxp_texture",
Host::TranslateStdString("OSDMessage", "PGXP texture correction disabled by game settings."), osd_duration);
} }
settings.gpu_pgxp_texture_correction = false; settings.gpu_pgxp_texture_correction = false;
@ -361,7 +374,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_pgxp_enable && !settings.gpu_pgxp_vertex_cache) if (display_osd_messages && settings.gpu_pgxp_enable && !settings.gpu_pgxp_vertex_cache)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "PGXP vertex cache forced by game settings."), Host::AddKeyedOSDMessage("gamedb_force_pgxp_vertex_cache",
Host::TranslateStdString("OSDMessage", "PGXP vertex cache forced by game settings."),
osd_duration); osd_duration);
} }
@ -372,7 +386,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_pgxp_enable && !settings.gpu_pgxp_cpu) if (display_osd_messages && settings.gpu_pgxp_enable && !settings.gpu_pgxp_cpu)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "PGXP CPU mode forced by game settings."), Host::AddKeyedOSDMessage("gamedb_force_pgxp_cpu",
Host::TranslateStdString("OSDMessage", "PGXP CPU mode forced by game settings."),
osd_duration); osd_duration);
} }
@ -383,19 +398,14 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
{ {
if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_depth_buffer) if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_depth_buffer)
{ {
Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "PGXP Depth Buffer disabled by game settings."), Host::AddKeyedOSDMessage("gamedb_disable_pgxp_depth",
Host::TranslateStdString("OSDMessage", "PGXP Depth Buffer disabled by game settings."),
osd_duration); osd_duration);
} }
settings.gpu_pgxp_depth_buffer = false; settings.gpu_pgxp_depth_buffer = false;
} }
if (HasTrait(Trait::ForceSoftwareRenderer))
{
Log_WarningPrint("Using software renderer for readbacks.");
settings.gpu_renderer = GPURenderer::Software;
}
if (HasTrait(Trait::ForceRecompilerMemoryExceptions)) if (HasTrait(Trait::ForceRecompilerMemoryExceptions))
{ {
Log_WarningPrint("Memory exceptions for recompiler forced by game settings."); Log_WarningPrint("Memory exceptions for recompiler forced by game settings.");
@ -451,8 +461,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
Host::TranslateString("ControllerType", Settings::GetControllerTypeDisplayName(supported_ctype))); Host::TranslateString("ControllerType", Settings::GetControllerTypeDisplayName(supported_ctype)));
} }
Host::AddFormattedOSDMessage( Host::AddKeyedFormattedOSDMessage(
30.0f, "gamedb_controller_unsupported", 30.0f,
Host::TranslateString("OSDMessage", Host::TranslateString("OSDMessage",
"Controller in port %u (%s) is not supported for %s.\nSupported controllers: " "Controller in port %u (%s) is not supported for %s.\nSupported controllers: "
"%s\nPlease configure a supported controller from the list above."), "%s\nPlease configure a supported controller from the list above."),