(General/PS3/Xbox 1/Rmenu) Get rid of g_extern.menu_texture_path

frontend/menu/disp/rmenu.c

@@ -461,12 +461,22 @@ void rmenu_set_texture(void *data)
 
 static void rmenu_context_reset(void *data)
 {
+   char menu_bg[PATH_MAX];
    menu_handle_t *menu = (menu_handle_t*)data;
 
    if (!menu)
       return;
 
-   texture_image_load(menu_texture, g_extern.menu_texture_path);
+   fill_pathname_join(menu_bg, g_settings.assets_directory, "rmenu", sizeof(menu_bg));
+#ifdef _XBOX1
+   fill_pathname_join(menu_bg, menu_bg, "sd", sizeof(menu_bg));
+#else
+   fill_pathname_join(menu_bg, menu_bg, "hd", sizeof(menu_bg));
+#endif
+   fill_pathname_join(menu_bg, menu_bg, "main_menu.png", sizeof(menu_bg));
+
+   if (path_file_exists(menu_bg))
+      texture_image_load(menu_texture, menu_bg);
    menu->width = menu_texture->width;
    menu->height = menu_texture->height;
 

frontend/platform/platform_ps3.c

@@ -193,12 +193,6 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
       fill_pathname_join(g_defaults.config_path, g_defaults.port_dir, "retroarch.cfg",  sizeof(g_defaults.config_path));
       fill_pathname_join(g_defaults.overlay_dir, g_defaults.core_dir, "overlays", sizeof(g_defaults.overlay_dir));
       fill_pathname_join(g_defaults.assets_dir,   g_defaults.core_dir, "media", sizeof(g_defaults.assets_dir));
-#ifndef IS_SALAMANDER
-#ifdef HAVE_RMENU
-      fill_pathname_join(g_extern.menu_texture_path, g_defaults.core_dir, "borders/Menu/main-menu_1080p.png",
-            sizeof(g_extern.menu_texture_path));
-#endif
-#endif
    }
 
 #ifndef IS_SALAMANDER

frontend/platform/platform_xdk.c

@@ -142,9 +142,6 @@ static void frontend_xdk_get_environment_settings(int *argc, char *argv[],
    fill_pathname_join(g_defaults.sram_dir, g_defaults.core_dir, "savefiles", sizeof(g_defaults.sram_dir));
    fill_pathname_join(g_defaults.system_dir, g_defaults.core_dir, "system", sizeof(g_defaults.system_dir));
    fill_pathname_join(g_defaults.screenshot_dir, g_defaults.core_dir, "screenshots", sizeof(g_defaults.screenshot_dir));
-#ifndef IS_SALAMANDER
-   strlcpy(g_extern.menu_texture_path, "D:\\Media\\main-menu_480p.png", sizeof(g_extern.menu_texture_path));
-#endif
 #elif defined(_XBOX360)
    strlcpy(g_defaults.core_dir, "game:", sizeof(g_defaults.core_dir));
    strlcpy(g_defaults.core_info_dir, "game:", sizeof(g_defaults.core_info_dir));

general.h

@@ -433,10 +433,6 @@ struct global
    bool has_set_netplay_delay_frames;
    bool has_set_netplay_ip_port;
 
-#ifdef HAVE_RMENU
-   char menu_texture_path[PATH_MAX];
-#endif
-
    // Config associated with global "default" config.
    char config_path[PATH_MAX];
    char append_config_path[PATH_MAX];

settings.c

@@ -851,11 +851,6 @@ bool config_load_file(const char *path, bool set_defaults)
    bool flicker_filter_enable = false;
    bool soft_filter_enable = false;
 
-#ifdef HAVE_RMENU
-   if (config_get_path(conf, "menu_texture_path", tmp_str, sizeof(tmp_str)))
-      strlcpy(g_extern.menu_texture_path, tmp_str, sizeof(g_extern.menu_texture_path));
-#endif
-
    if (config_get_bool(conf, "triple_buffering_enable", &triple_buffering_enable))
    {
       if (triple_buffering_enable)
@@ -1432,9 +1427,6 @@ bool config_save_file(const char *path)
    config_set_int(conf, "custom_viewport_height", g_extern.console.screen.viewports.custom_vp.height);
    config_set_int(conf, "custom_viewport_x", g_extern.console.screen.viewports.custom_vp.x);
    config_set_int(conf, "custom_viewport_y", g_extern.console.screen.viewports.custom_vp.y);
-#ifdef HAVE_RMENU
-   config_set_path(conf, "menu_texture_path", g_extern.menu_texture_path);
-#endif
    config_set_float(conf, "video_font_size", g_settings.video.font_size);
 
    config_set_bool(conf, "block_sram_overwrite", g_settings.block_sram_overwrite);