From fbf4cdd08548d1d06783b4b75c718bbefb79662e Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 1 Feb 2026 13:25:51 +1000 Subject: [PATCH] dep/rcheevos: Bump to dedfe2d --- dep/rcheevos/CHANGELOG.md | 4 ++ dep/rcheevos/include/rc_client.h | 5 ++ dep/rcheevos/src/rc_client.c | 92 +++++++++++++++++++++++---- dep/rcheevos/src/rc_client_external.c | 4 ++ dep/rcheevos/src/rc_client_external.h | 6 +- dep/rcheevos/src/rcheevos/condset.c | 5 ++ 6 files changed, 103 insertions(+), 13 deletions(-) diff --git a/dep/rcheevos/CHANGELOG.md b/dep/rcheevos/CHANGELOG.md index 6b965333b..9b269b3e2 100644 --- a/dep/rcheevos/CHANGELOG.md +++ b/dep/rcheevos/CHANGELOG.md @@ -1,3 +1,7 @@ +# v12.2.1 +* fix parsing of leaderboards with comparisons in legacy-formatted values +* fix validation warning on long AddSource chains + # v12.2.0 * add rc_client_create_subset_list * add rc_client_begin_fetch_game_titles diff --git a/dep/rcheevos/include/rc_client.h b/dep/rcheevos/include/rc_client.h index bb89200ab..ae690d37d 100644 --- a/dep/rcheevos/include/rc_client.h +++ b/dep/rcheevos/include/rc_client.h @@ -528,6 +528,11 @@ typedef struct rc_client_achievement_t { */ RC_EXPORT const rc_client_achievement_t* RC_CCONV rc_client_get_achievement_info(rc_client_t* client, uint32_t id); +/** + * Gets the next achievement after a provided achievement that fits in the specified bucket. Returns NULL if none found. + */ +RC_EXPORT const rc_client_achievement_t * RC_CCONV rc_client_get_next_achievement_info(rc_client_t * client, const rc_client_achievement_t * achievement, int bucket); + /** * Gets the URL for the achievement image. * Returns RC_OK on success. diff --git a/dep/rcheevos/src/rc_client.c b/dep/rcheevos/src/rc_client.c index 883c408f8..c262b6cb5 100644 --- a/dep/rcheevos/src/rc_client.c +++ b/dep/rcheevos/src/rc_client.c @@ -4339,6 +4339,62 @@ const rc_client_achievement_t* rc_client_get_achievement_info(rc_client_t* clien return NULL; } +const rc_client_achievement_t* rc_client_get_next_achievement_info(rc_client_t* client, + const rc_client_achievement_t* achievement, int bucket) +{ + const rc_client_achievement_info_t* after = (const rc_client_achievement_info_t*)achievement; + rc_client_achievement_info_t* achievement_info; + time_t recent_unlock_time; + rc_client_subset_info_t* subset; + + if (!client) + return NULL; + +#ifdef RC_CLIENT_SUPPORTS_EXTERNAL + if (client->state.external_client && client->state.external_client->get_next_achievement_info) + return client->state.external_client->get_next_achievement_info(achievement ? achievement->id : 0, bucket); +#endif + + if (!client->game) + return NULL; + + recent_unlock_time = time(NULL) - RC_CLIENT_RECENT_UNLOCK_DELAY_SECONDS; + for (subset = client->game->subsets; subset; subset = subset->next) { + if (subset->active && subset->public_.num_achievements > 0) { + const rc_client_achievement_info_t* start = subset->achievements; + const rc_client_achievement_info_t* stop = start + subset->public_.num_achievements; + if (after == NULL || (after >= start && after <= stop)) { + /* found a subset containing the provided achievement. look for the next + * achievement matching the requested bucket */ + uint32_t index = after ? (uint32_t)(after - start) + 1 : 0; + do { + if (index >= subset->public_.num_achievements) { + /* done with this subset. find the next active subset with achievements */ + do { + subset = subset->next; + if (!subset) + return NULL; + } while (!subset->active || subset->public_.num_achievements == 0); + + index = 0; + } + + /* found an achievement. check to see if it matches the requested bucket. */ + achievement_info = &subset->achievements[index]; + rc_client_update_achievement_display_information(client, achievement_info, recent_unlock_time); + if (achievement_info->public_.bucket == bucket) + return &achievement_info->public_; + + ++index; + } while (1); + } + } + } + + return NULL; +} + + int rc_client_achievement_get_image_url(const rc_client_achievement_t* achievement, int state, char buffer[], size_t buffer_size) { const int image_type = (state == RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED) ? @@ -4924,6 +4980,7 @@ int rc_client_has_leaderboards(rc_client_t* client) { rc_client_subset_info_t* subset; int result; + uint32_t i; if (!client) return 0; @@ -4938,17 +4995,21 @@ int rc_client_has_leaderboards(rc_client_t* client) rc_mutex_lock(&client->state.mutex); - subset = client->game->subsets; result = 0; - for (; subset; subset = subset->next) + for (subset = client->game->subsets; subset; subset = subset->next) { if (!subset->active) continue; - if (subset->public_.num_leaderboards > 0) { - result = 1; - break; + for (i = 0; i < subset->public_.num_leaderboards; ++i) { + if (!subset->leaderboards[i].hidden) { + result = 1; + break; + } } + + if (result) + break; } rc_mutex_unlock(&client->state.mutex); @@ -5492,6 +5553,14 @@ static void rc_client_ping(rc_client_scheduled_callback_data_t* callback_data, r if (client->state.frames_processed != client->state.frames_at_last_ping) { client->state.frames_at_last_ping = client->state.frames_processed; + memset(&api_params, 0, sizeof(api_params)); + api_params.username = client->user.username; + api_params.api_token = client->user.token; + api_params.game_id = client->game->public_.id; + api_params.rich_presence = buffer; + api_params.game_hash = client->game->public_.hash; + api_params.hardcore = client->state.hardcore; + if (!client->callbacks.rich_presence_override || !client->callbacks.rich_presence_override(client, buffer, sizeof(buffer))) { rc_mutex_lock(&client->state.mutex); @@ -5502,13 +5571,12 @@ static void rc_client_ping(rc_client_scheduled_callback_data_t* callback_data, r rc_mutex_unlock(&client->state.mutex); } - memset(&api_params, 0, sizeof(api_params)); - api_params.username = client->user.username; - api_params.api_token = client->user.token; - api_params.game_id = client->game->public_.id; - api_params.rich_presence = buffer; - api_params.game_hash = client->game->public_.hash; - api_params.hardcore = client->state.hardcore; + /* there's a miniscule chance the game will be changed out while we're waiting for the lock. + * if that happens, discard this ping. the new game will have scheduled its own ping. + * don't reschedule this one. */ + if (!client->game || client->game->public_.id != api_params.game_id) { + return; + } result = rc_api_init_ping_request_hosted(&request, &api_params, &client->state.host); if (result != RC_OK) { diff --git a/dep/rcheevos/src/rc_client_external.c b/dep/rcheevos/src/rc_client_external.c index 0cf90dbb0..c65371ddf 100644 --- a/dep/rcheevos/src/rc_client_external.c +++ b/dep/rcheevos/src/rc_client_external.c @@ -5,6 +5,8 @@ #include "rc_api_runtime.h" +#ifdef RC_CLIENT_SUPPORTS_EXTERNAL + #define RC_CONVERSION_FILL(obj, obj_type, src_type) memset((uint8_t*)obj + sizeof(src_type), 0, sizeof(obj_type) - sizeof(src_type)) /* https://media.retroachievements.org/Badge/123456_lock.png is 58 with null terminator */ @@ -275,3 +277,5 @@ rc_client_achievement_list_t* rc_client_external_convert_v1_achievement_list(con return (rc_client_achievement_list_t*)new_list; } + +#endif /* RC_CLIENT_SUPPORTS_EXTERNAL */ diff --git a/dep/rcheevos/src/rc_client_external.h b/dep/rcheevos/src/rc_client_external.h index d73e581b8..b3c0e5eba 100644 --- a/dep/rcheevos/src/rc_client_external.h +++ b/dep/rcheevos/src/rc_client_external.h @@ -46,6 +46,7 @@ typedef void (RC_CCONV* rc_client_external_add_game_hash_func_t)(const char* has struct rc_client_achievement_list_info_t; typedef struct rc_client_achievement_list_info_t* (RC_CCONV *rc_client_external_create_achievement_list_func_t)(int category, int grouping); typedef const rc_client_achievement_t* (RC_CCONV *rc_client_external_get_achievement_info_func_t)(uint32_t id); +typedef const rc_client_achievement_t* (RC_CCONV* rc_client_external_get_next_achievement_info_func_t)(uint32_t id, int grouping); /* NOTE: rc_client_external_create_leaderboard_list_func_t returns an internal wrapper structure which contains the public list * and a destructor function. */ @@ -152,9 +153,12 @@ typedef struct rc_client_external_t /* VERSION 6 */ rc_client_external_create_subset_list_func_t create_subset_list; + /* VERSION 7 */ + rc_client_external_get_next_achievement_info_func_t get_next_achievement_info; + } rc_client_external_t; -#define RC_CLIENT_EXTERNAL_VERSION 5 +#define RC_CLIENT_EXTERNAL_VERSION 7 void rc_client_add_game_hash(rc_client_t* client, const char* hash, uint32_t game_id); void rc_client_load_unknown_game(rc_client_t* client, const char* hash); diff --git a/dep/rcheevos/src/rcheevos/condset.c b/dep/rcheevos/src/rcheevos/condset.c index bde13427e..b19d3fd22 100644 --- a/dep/rcheevos/src/rcheevos/condset.c +++ b/dep/rcheevos/src/rcheevos/condset.c @@ -263,6 +263,11 @@ rc_condset_t* rc_parse_condset(const char** memaddr, rc_parse_state_t* parse) { next = &self->conditions; + /* prevent bleedthrough of incomplete conditions from other groups */ + parse->addsource_oper = RC_OPERATOR_NONE; + parse->addsource_parent.type = RC_OPERAND_NONE; + parse->indirect_parent.type = RC_OPERAND_NONE; + /* each condition set has a functionally new recall accumulator */ parse->remember.type = RC_OPERAND_NONE;