finish up RA support (#745)

* finish up RA support * more * capture some corner cases * fix post data * more * more * fix range * more * more * more * more * show in-progress achievements * more * more * more * more
2026-07-11 01:25:20 +02:00 · 2026-04-15 12:57:52 +02:00
parent d12f16fe29
commit b40ec6940f
17 changed files with 155 additions and 57 deletions
@@ -7,6 +7,7 @@
 #include <string.h>

 void rust_server_call(const char *url, const char *post_data,
+                      const char *content_type,
                      rc_client_server_callback_t callback,
                      void *callback_data);
 void store_retroachievements_credentials(const char *username,
@@ -28,7 +29,7 @@ static rc_client_leaderboard_list_t *g_leaderboard_list = NULL;

 static uint32_t read_memory(uint32_t address, uint8_t *buffer,
                            uint32_t num_bytes, rc_client_t *client) {
-  if (address + num_bytes >= g_dmem_size)
+  if (address + num_bytes > g_dmem_size)
    memset(buffer, 0, num_bytes);
  else
    memcpy(buffer, &g_dmem[address], num_bytes);
@@ -38,7 +39,8 @@ static uint32_t read_memory(uint32_t address, uint8_t *buffer,
 static void server_call(const rc_api_request_t *request,
                        rc_client_server_callback_t callback,
                        void *callback_data, rc_client_t *client) {
-  rust_server_call(request->url, request->post_data, callback, callback_data);
+  rust_server_call(request->url, request->post_data, request->content_type,
+                   callback, callback_data);
 }

 void ra_http_callback(const char *content, size_t content_size, int status_code,
@@ -75,6 +77,8 @@ static void login_callback(int result, const char *error_message,
             "RA login failed: %s", error_message);
    store_retroachievements_credentials(NULL, NULL, userdata);
    return;
+  } else {
+    memset(load_game_error_message, 0, sizeof(load_game_error_message));
  }

  // Login was successful. Capture the token for future logins so we don't have
@@ -94,6 +98,8 @@ const char *ra_get_token() { return g_token; }

 void ra_logout_user() {
  g_user_logged_in = false;
+  g_username = NULL;
+  g_token = NULL;
  rc_client_logout(g_client);
 }

@@ -124,6 +130,8 @@ static void load_game_callback(int result, const char *error_message,
             "RA load failed: %s", error_message);
    notify_load_game(userdata);
    return;
+  } else {
+    memset(load_game_error_message, 0, sizeof(load_game_error_message));
  }

  if (!rc_client_is_processing_required(client)) {
@@ -139,8 +147,7 @@ static void load_game_callback(int result, const char *error_message,

 void ra_welcome() {
  if (strlen(load_game_error_message) > 0) {
-    rdp_onscreen_message(load_game_error_message);
-    rdp_onscreen_message(load_game_error_message); // show it a bit longer
+    rdp_onscreen_message(load_game_error_message, true);
  }
  if (!g_game_loaded)
    return;
@@ -163,8 +170,7 @@ void ra_welcome() {
    snprintf(buffer + message_length, sizeof(buffer) - message_length,
             "Game has no achievements");
  }
-  rdp_onscreen_message(buffer);
-  rdp_onscreen_message(buffer); // show it a bit longer
+  rdp_onscreen_message(buffer, true);
 }

 void ra_load_game(const uint8_t *rom, size_t rom_size, void *userdata) {
@@ -188,14 +194,14 @@ static void leaderboard_submitted(const rc_client_leaderboard_t *leaderboard) {

  snprintf(buffer, sizeof(buffer), "Leaderboard submitted: %s - %s",
           leaderboard->title, leaderboard->tracker_value);
-  rdp_onscreen_message(buffer);
+  rdp_onscreen_message(buffer, false);
 }

 static void achievement_triggered(const rc_client_achievement_t *achievement) {
  char buffer[512];

  snprintf(buffer, sizeof(buffer), "Unlocked: %s", achievement->title);
-  rdp_onscreen_message(buffer);
+  rdp_onscreen_message(buffer, false);
 }

 static void game_completed(rc_client_t *client) {
@@ -205,7 +211,7 @@ static void game_completed(rc_client_t *client) {
  snprintf(buffer, sizeof(buffer), "%s: %s",
           rc_client_get_hardcore_enabled(client) ? "Mastered" : "Completed",
           game->title);
-  rdp_onscreen_message(buffer);
+  rdp_onscreen_message(buffer, false);
 }

 static void subset_completed(const rc_client_subset_t *subset,
@@ -215,7 +221,7 @@ static void subset_completed(const rc_client_subset_t *subset,
  snprintf(buffer, sizeof(buffer), "Subset %s: %s",
           rc_client_get_hardcore_enabled(client) ? "mastered" : "completed",
           subset->title);
-  rdp_onscreen_message(buffer);
+  rdp_onscreen_message(buffer, false);
 }

 static void server_error(const rc_client_server_error_t *server_error) {
@@ -223,10 +229,13 @@ static void server_error(const rc_client_server_error_t *server_error) {

  snprintf(buffer, sizeof(buffer), "RA server error: %s",
           server_error->error_message);
-  rdp_onscreen_message(buffer);
+  rdp_onscreen_message(buffer, false);
 }

 static const char *get_leaderboard_title(const char *display) {
+  if (g_leaderboard_list == NULL)
+    return NULL;
+
  for (uint32_t i = 0; i < g_leaderboard_list->num_buckets; i++) {
    for (uint32_t j = 0; j < g_leaderboard_list->buckets[i].num_leaderboards;
         j++) {
@@ -314,7 +323,6 @@ void ra_init_client(bool hardcore, bool challenge, bool leaderboard) {
  g_user_logged_in = false;
  g_dmem = NULL;
  g_dmem_size = 0;
-  memset(load_game_error_message, 0, sizeof(load_game_error_message));

  // Provide a logging function to simplify debugging
  rc_client_enable_logging(g_client, RC_CLIENT_LOG_LEVEL_WARN, log_message);
@@ -383,3 +391,35 @@ void ra_load_state(const uint8_t *state, size_t state_size) {
    printf("RetroAchievements: Failed to deserialize progress\n");
  }
 }
+
+void ra_display_inprogress_achievements(void *userdata) {
+  if (!g_game_loaded)
+    return;
+
+  rc_client_achievement_list_t *list = rc_client_create_achievement_list(
+      g_client, RC_CLIENT_ACHIEVEMENT_CATEGORY_CORE,
+      RC_CLIENT_ACHIEVEMENT_LIST_GROUPING_LOCK_STATE);
+
+  char buffer[1024] = {0};
+  size_t buffer_length = 0;
+
+  for (uint32_t i = 0; i < list->num_buckets; i++) {
+    if (list->buckets[i].bucket_type == RC_CLIENT_ACHIEVEMENT_BUCKET_LOCKED) {
+      for (uint32_t j = 0; j < list->buckets[i].num_achievements; j++) {
+        const rc_client_achievement_t *achievement =
+            list->buckets[i].achievements[j];
+        if (achievement->measured_percent > 0.0f) {
+          if (buffer_length < sizeof(buffer) - 1) {
+            buffer_length += snprintf(
+                buffer + buffer_length, sizeof(buffer) - buffer_length,
+                "%s: %s\n", achievement->title, achievement->measured_progress);
+          }
+        }
+      }
+    }
+  }
+  if (buffer_length > 0) {
+    rdp_onscreen_message(buffer, false);
+  }
+  rc_client_destroy_achievement_list(list);
+}
@@ -22,3 +22,11 @@ const char *ra_get_token();
 size_t ra_state_size();
 void ra_save_state(uint8_t *state, size_t state_size);
 void ra_load_state(const uint8_t *state, size_t state_size);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+void ra_display_inprogress_achievements(void *userdata);
+#ifdef __cplusplus
+}
+#endif