github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Achievements: Fix login while ingame

Browse Source
This commit is contained in:
Stenzek 2025-04-10 21:12:35 +10:00
parent 21560537c2
commit 4708a8fda4
No known key found for this signature in database
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/achievements.cpp
View File

@ -137,6 +137,7 @@ template<typename... T>
static void ReportRCError(int err, fmt::format_string<T...> fmt, T&&... args); static void ReportRCError(int err, fmt::format_string<T...> fmt, T&&... args);
static void ClearGameInfo(); static void ClearGameInfo();
static void ClearGameHash(); static void ClearGameHash();
static bool HasSavedCredentials();
static bool TryLoggingInWithToken(); static bool TryLoggingInWithToken();
static void EnableHardcodeMode(bool display_message, bool display_game_summary); static void EnableHardcodeMode(bool display_message, bool display_game_summary);
static void OnHardcoreModeChanged(bool enabled, bool display_message, bool display_game_summary); static void OnHardcoreModeChanged(bool enabled, bool display_message, bool display_game_summary);
@ -717,10 +718,17 @@ void Achievements::DestroyClient(rc_client_t** client, std::unique_ptr<HTTPDownl
http->reset(); http->reset();
} }
bool Achievements::HasSavedCredentials()
{
const TinyString username = Host::GetTinyStringSettingValue("Cheevos", "Username");
const TinyString api_token = Host::GetTinyStringSettingValue("Cheevos", "Token");
return (!username.empty() && !api_token.empty());
}
bool Achievements::TryLoggingInWithToken() bool Achievements::TryLoggingInWithToken()
{ {
std::string username = Host::GetBaseStringSettingValue("Cheevos", "Username"); const TinyString username = Host::GetTinyStringSettingValue("Cheevos", "Username");
std::string api_token = Host::GetBaseStringSettingValue("Cheevos", "Token"); const TinyString api_token = Host::GetTinyStringSettingValue("Cheevos", "Token");
if (username.empty() || api_token.empty()) if (username.empty() || api_token.empty())
return false; return false;
@ -1264,8 +1272,6 @@ bool Achievements::IdentifyCurrentGame()
void Achievements::BeginLoadGame() void Achievements::BeginLoadGame()
{ {
DebugAssert(IsLoggedInOrLoggingIn());
if (!s_state.game_hash.has_value()) if (!s_state.game_hash.has_value())
{ {
// no need to go through ClientLoadGameCallback, just bail out straight away // no need to go through ClientLoadGameCallback, just bail out straight away
@ -1300,6 +1306,12 @@ void Achievements::ClientLoadGameCallback(int result, const char* error_message,
{ {
// We would've asked to re-authenticate, so leave HC on for now. // We would've asked to re-authenticate, so leave HC on for now.
// Once we've done so, we'll reload the game. // Once we've done so, we'll reload the game.
if (!HasSavedCredentials())
{
DisableHardcoreMode(false, false);
return;
}
return; return;
} }
else if (result == RC_HARDCORE_DISABLED) else if (result == RC_HARDCORE_DISABLED)
@ -2221,6 +2233,7 @@ void Achievements::Logout()
{ {
ClearGameInfo(); ClearGameInfo();
UpdateGlyphRanges(); UpdateGlyphRanges();
DisableHardcoreMode(false, false);
} }
CancelHashDatabaseRequests(); CancelHashDatabaseRequests();