fix non-griffin build

Author: Jamiras

cheevos/cheevos.c

@@ -640,6 +640,15 @@ int rcheevos_get_richpresence(char* s, size_t len)
    return (int)rc_client_get_rich_presence_message(rcheevos_locals.client, s, (size_t)len);
 }
 
+int rcheevos_get_game_badge_url(char* s, size_t len)
+{
+   const rc_client_game_t* game = rc_client_get_game_info(rcheevos_locals.client);
+   if (!game || !game->id || !game->badge_name || !game->badge_name[0])
+      return 0;
+
+   return (rc_client_game_get_image_url(game, s, len) == RC_OK);
+}
+
 #ifdef HAVE_GFX_WIDGETS
 
 static void rcheevos_hide_widgets(bool widgets_ready)
@@ -1419,15 +1428,15 @@ static void rcheevos_finalize_game_load(rc_client_t* client)
    settings_t* settings = config_get_ptr();
    bool want_badges     = settings->bools.cheevos_badges_enable;
 #if !defined(HAVE_GFX_WIDGETS)
-   /* Then badges are only needed for xmb and ozone menus */
+   /* Then badges are only needed for xmb, ozone, and rgui menus */
    want_badges          = want_badges &&
       (        string_is_equal(settings->arrays.menu_driver, "xmb")
-            || string_is_equal(settings->arrays.menu_driver, "ozone"));
+            || string_is_equal(settings->arrays.menu_driver, "ozone")
+            || string_is_equal(settings->arrays.menu_driver, "rgui"));
 #endif
    if (want_badges) /* prefetch the game badge */
    {
-      const rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
-      const rc_client_game_t* game = rc_client_get_game_info(rcheevos_locals->client);
+      const rc_client_game_t* game = rc_client_get_game_info(client);
       char badge[32];
 
       badge[0] = 'i';

cheevos/cheevos_client.c

@@ -34,6 +34,11 @@
 #include "../network/presence.h"
 #endif
 
+#ifdef HAVE_MENU
+#include "cheevos_menu.h"
+#include "../menu/menu_driver.h"
+#endif
+
 #include "../deps/rcheevos/include/rc_api_runtime.h"
 #include "../deps/rcheevos/include/rc_api_user.h"
 
@@ -553,8 +558,11 @@ static void rcheevos_client_fetch_next_badge(rc_client_download_queue_t* queue)
       {
          if (--queue->outstanding_requests == 0)
          {
-            if (queue->pass == 2) /* all badges successfully loaded */
-               rcheevos_locals.badges_loaded = true;
+            if (queue->pass == 2)
+            {
+               /* all badges successfully loaded */
+               get_rcheevos_locals()->badges_loaded = true;
+            }
 
             done = true; /* destroy queue */
          }
@@ -583,7 +591,7 @@ static void rcheevos_client_fetch_next_badge(rc_client_download_queue_t* queue)
       }
       rc_client_destroy_achievement_list(queue->list);
 
-      rcheevos_locals.badges_loading = false;
+      get_rcheevos_locals()->badges_loading = false;
 
 #ifdef HAVE_THREADS
       slock_free(queue->lock);

cheevos/cheevos_menu.c

@@ -246,6 +246,8 @@ uintptr_t rcheevos_menu_get_badge_texture(unsigned menu_offset)
 
 void rcheevos_menu_update_badge_references(const char* badge_name)
 {
+   rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
+   unsigned i;
    char unlocked_badge_name[8];
    const size_t badge_name_len = strlen(badge_name);
    if (badge_name_len > 6 && badge_name_len < sizeof(unlocked_badge_name) + 5 &&
@@ -256,10 +258,9 @@ void rcheevos_menu_update_badge_references(const char* badge_name)
       badge_name = unlocked_badge_name;
    }
 
-   unsigned i;
-   for (i = 0; i < rcheevos_locals.menuitem_count; ++i)
+   for (i = 0; i < rcheevos_locals->menuitem_count; ++i)
    {
-      rcheevos_menuitem_t* menuitem = &rcheevos_locals.menuitems[i];
+      rcheevos_menuitem_t* menuitem = &rcheevos_locals->menuitems[i];
       if (menuitem->menu_badge_grayscale >= 2 && /* using placeholder */
           strncmp(menuitem->achievement->badge_name, badge_name, badge_name_len) == 0)
       {