From 8b9ad28ecbe5f7bf0105123ec14013b1813f0c81 Mon Sep 17 00:00:00 2001
From: GameDragon2k <gdragon2k@yahoo.com>
Date: Sat, 21 Oct 2017 17:48:26 -0400
Subject: [PATCH] channges to populate and apply badges.

---
 cheevos/cheevos.c  |  7 +++++--
 menu/drivers/xmb.c | 25 +++++--------------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index 0ed68488ae..bce5770895 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -35,6 +35,7 @@
 #include "../menu/menu_entries.h"
 #endif
 
+#include "badges.h"
 #include "cheevos.h"
 #include "var.h"
 #include "cond.h"
@@ -2157,16 +2158,17 @@ void cheevos_populate_menu(void *data, bool hardcore)
          {
             menu_entries_append_enum(info->list, cheevo->title,
                   cheevo->description, MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
-                  MENU_SETTINGS_CHEEVOS_START + i, 0, atoi(cheevo->badge));
+                  MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
             items_found++;
          }
          else
          {
             menu_entries_append_enum(info->list, cheevo->title,
                   cheevo->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
-                  MENU_SETTINGS_CHEEVOS_START + i, 0, atoi(cheevo->badge));
+                  MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
             items_found++;
          }
+         set_badge_info(&badges_ctx, i, cheevo->badge, (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
       }
       else
       {
@@ -2184,6 +2186,7 @@ void cheevos_populate_menu(void *data, bool hardcore)
                   MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
             items_found++;
          }
+         set_badge_info(&badges_ctx, i, cheevo->badge, (cheevo->active & CHEEVOS_ACTIVE_HARDCORE));
       }
    }
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 49df1ce1c8..c5bc6a2c47 100755
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -61,6 +61,8 @@
 
 #include "../../tasks/tasks_internal.h"
 
+#include "../../cheevos/badges.h"
+
 #define XMB_RIBBON_ROWS 64
 #define XMB_RIBBON_COLS 64
 #define XMB_RIBBON_VERTICES 2*XMB_RIBBON_COLS*XMB_RIBBON_ROWS-2*XMB_RIBBON_COLS
@@ -252,15 +254,6 @@ typedef struct xmb_handle
       menu_texture_item list[XMB_TEXTURE_LAST];
    } textures;
 
-#ifdef HAVE_CHEEVOS
-  struct
-  {
-    size_t current_badge;
-    menu_texture_item test;
-    menu_texture_item list[XMB_TEXTURE_LAST];
-  } badges;
-#endif
-
    xmb_node_t main_menu_node;
 #ifdef HAVE_IMAGEVIEWER
    xmb_node_t images_tab_node;
@@ -2252,13 +2245,9 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
   if ((type >= MENU_SETTINGS_CHEEVOS_START) &&
     (type < MENU_SETTINGS_NETPLAY_ROOMS_START))
     {
-      unsigned new_id        = type - MENU_SETTINGS_CHEEVOS_START;
-      int bufferSize = 16;
-      char new_str[bufferSize];
-      snprintf(new_str, bufferSize, "%05d", (int)xmb->badges.current_badge);
-      strcat(new_str, ".png");
-      menu_display_reset_textures_list(new_str, "badges", &xmb->badges.list[new_id], TEXTURE_FILTER_MIPMAP_LINEAR);
-      return xmb->badges.list[new_id];
+      //return badges_ctx.menu_texture_list[type - MENU_SETTINGS_CHEEVOS_START];
+      int new_id = type - MENU_SETTINGS_CHEEVOS_START;
+      return get_badge_texture( new_id );
     }
 #endif
 
@@ -2489,10 +2478,6 @@ static int xmb_draw_item(
 
    if (color[3] != 0)
    {
-#ifdef HAVE_CHEEVOS
-  xmb->badges.current_badge = entry->entry_idx;
-#endif
-
       math_matrix_4x4 mymat_tmp;
       menu_display_ctx_rotate_draw_t rotate_draw;
       uintptr_t texture        = xmb_icon_get_id(xmb, core_node, node,