history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-19 00:35:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Achievements: Fix a few minor issues

Browse Source
This commit is contained in:
Connor McLaughlin
2022-10-08 20:59:18 +10:00
parent 8d53eb5df8
commit 42768c3101
6 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontend-common/achievements.cpp
View File

@ -498,9 +498,9 @@ void Achievements::UpdateSettings(const Settings& old_config)
}
else if (!s_challenge_mode && g_settings.achievements_challenge_mode)
{
Host::AddKeyedOSDMessage(
"challenge_mode_reset",
Host::TranslateStdString("Achievements", "Hardcore mode will be enabled on system reset."), 10.0f);
ImGuiFullscreen::ShowToast(
std::string(), Host::TranslateStdString("Achievements", "Hardcore mode will be enabled on system reset."),
10.0f);
}
}
@ -560,13 +560,13 @@ void Achievements::DisableChallengeMode()
SetChallengeMode(false);
}
void Achievements::ResetChallengeMode()
bool Achievements::ResetChallengeMode()
{
if (!s_active)
return;
if (!s_active || s_challenge_mode == g_settings.achievements_challenge_mode)
return false;
if (s_challenge_mode != g_settings.achievements_challenge_mode)
SetChallengeMode(g_settings.achievements_challenge_mode);
SetChallengeMode(g_settings.achievements_challenge_mode);
return true;
}
void Achievements::SetChallengeMode(bool enabled)
@ -579,10 +579,10 @@ void Achievements::SetChallengeMode(bool enabled)
if (HasActiveGame())
{
Host::AddKeyedOSDMessage("achievements_set_challenge_mode",
enabled ? Host::TranslateStdString("Achievements", "Hardcore mode is now enabled.") :
Host::TranslateStdString("Achievements", "Hardcore mode is now disabled."),
10.0f);
ImGuiFullscreen::ShowToast(std::string(),
enabled ? Host::TranslateStdString("Achievements", "Hardcore mode is now enabled.") :
Host::TranslateStdString("Achievements", "Hardcore mode is now disabled."),
10.0f);
}
if (HasActiveGame() && !IsTestModeActive())

2
src/frontend-common/achievements.h
View File

@ -119,7 +119,7 @@ void Logout();
void GameChanged(const std::string& path, CDImage* image);
/// Re-enables hardcode mode if it is enabled in the settings.
void ResetChallengeMode();
bool ResetChallengeMode();
/// Forces hardcore mode off until next reset.
void DisableChallengeMode();

5
src/frontend-common/fullscreen_ui.cpp
View File

@ -585,7 +585,10 @@ void FullscreenUI::CheckForConfigChanges(const Settings& old_settings)
// If achievements got disabled, we might have the menu open...
// That means we're going to be reading achievement state.
if (old_settings.achievements_enabled && !g_settings.achievements_enabled)
ReturnToMainWindow();
{
if (s_current_main_window == MainWindowType::Achievements || s_current_main_window == MainWindowType::Leaderboards)
ReturnToMainWindow();
}
#endif
}

2
src/frontend-common/imgui_fullscreen.cpp
View File

@ -2144,7 +2144,7 @@ void ImGuiFullscreen::DrawMessageDialog()
}
}
static float s_notification_vertical_position = 0.3f;
static float s_notification_vertical_position = 0.15f;
static float s_notification_vertical_direction = 1.0f;
float ImGuiFullscreen::GetNotificationVerticalPosition()