github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-07-21 09:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Achievements: Consider all-hidden-leaderboards as no leaderboards

Browse Source 
Stops the menu option being available and showing 0 leaderboards.
This commit is contained in:
Stenzek 2025-03-29 20:00:05 +10:00
parent b4ae19411b
commit 54c42f9c27
No known key found for this signature in database
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dep/rcheevos/include/rc_client.h
View File

@ -596,7 +596,7 @@ RC_EXPORT void RC_CCONV rc_client_destroy_leaderboard_list(rc_client_leaderboard
/** /**
* Returns non-zero if the current game has any leaderboards. * Returns non-zero if the current game has any leaderboards.
*/ */
RC_EXPORT int RC_CCONV rc_client_has_leaderboards(rc_client_t* client); RC_EXPORT int RC_CCONV rc_client_has_leaderboards(rc_client_t* client, int include_hidden);
typedef struct rc_client_leaderboard_entry_t { typedef struct rc_client_leaderboard_entry_t {
const char* user; const char* user;

20
dep/rcheevos/src/rc_client.c
View File

@ -4465,10 +4465,10 @@ void rc_client_destroy_leaderboard_list(rc_client_leaderboard_list_t* list)
free(list); free(list);
} }
int rc_client_has_leaderboards(rc_client_t* client) int rc_client_has_leaderboards(rc_client_t* client, int include_hidden)
{ {
rc_client_subset_info_t* subset; rc_client_subset_info_t* subset;
int result; int i, result;
if (!client) if (!client)
return 0; return 0;
@ -4491,8 +4491,20 @@ int rc_client_has_leaderboards(rc_client_t* client)
continue; continue;
if (subset->public_.num_leaderboards > 0) { if (subset->public_.num_leaderboards > 0) {
result = 1; if (!include_hidden) {
break; for (i = 0; i < subset->public_.num_leaderboards; i++) {
if (subset->leaderboards[i].hidden)
continue;
result = 1;
break;
}
if (result)
break;
} else {
result = 1;
break;
}
} }
} }

7
src/core/achievements.cpp
View File

@ -515,7 +515,7 @@ void Achievements::UpdateGlyphRanges()
} }
} }
if (rc_client_has_leaderboards(s_state.client)) if (rc_client_has_leaderboards(s_state.client, false))
{ {
rc_client_leaderboard_list_t* const leaderboards = rc_client_leaderboard_list_t* const leaderboards =
rc_client_create_leaderboard_list(s_state.client, RC_CLIENT_LEADERBOARD_LIST_GROUPING_NONE); rc_client_create_leaderboard_list(s_state.client, RC_CLIENT_LEADERBOARD_LIST_GROUPING_NONE);
@ -1304,7 +1304,7 @@ void Achievements::ClientLoadGameCallback(int result, const char* error_message,
} }
const bool has_achievements = rc_client_has_achievements(client); const bool has_achievements = rc_client_has_achievements(client);
const bool has_leaderboards = rc_client_has_leaderboards(client); const bool has_leaderboards = rc_client_has_leaderboards(client, false);
// Only display summary if the game title has changed across discs. // Only display summary if the game title has changed across discs.
const bool display_summary = (s_state.game_id != info->id || s_state.game_title != info->title); const bool display_summary = (s_state.game_id != info->id || s_state.game_title != info->title);
@ -2057,7 +2057,8 @@ bool Achievements::IsLoggedInOrLoggingIn()
bool Achievements::CanEnableHardcoreMode() bool Achievements::CanEnableHardcoreMode()
{ {
return (s_state.load_game_request || s_state.has_achievements || s_state.has_leaderboards); // have to re-query leaderboards because hidden should still trip HC
return (s_state.load_game_request || s_state.has_achievements || rc_client_has_leaderboards(s_state.client, true));
} }
bool Achievements::Login(const char* username, const char* password, Error* error) bool Achievements::Login(const char* username, const char* password, Error* error)