From aa4c2018afca4ce1bc9f180103eca9b155a280fa Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 19 Aug 2014 15:55:11 +0200 Subject: [PATCH] (General/PS3/Xbox 1/Rmenu) Get rid of g_extern.menu_texture_path --- frontend/menu/disp/rmenu.c | 12 +++++++++++- frontend/platform/platform_ps3.c | 6 ------ frontend/platform/platform_xdk.c | 3 --- general.h | 4 ---- media/rmenu/captain-cpsx.png | Bin 17979 -> 0 bytes media/rmenu/main-menu.xcf | Bin 54690 -> 0 bytes media/rmenu/main-menu_1080p.png | Bin 10695 -> 0 bytes media/xbox1/main-menu_480p.png | Bin 716 -> 0 bytes settings.c | 8 -------- 9 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 media/rmenu/captain-cpsx.png delete mode 100644 media/rmenu/main-menu.xcf delete mode 100644 media/rmenu/main-menu_1080p.png delete mode 100644 media/xbox1/main-menu_480p.png diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c index 95b937237e..1e373a2243 100644 --- a/frontend/menu/disp/rmenu.c +++ b/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; diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index 3ea51a8295..c2a43a847d 100644 --- a/frontend/platform/platform_ps3.c +++ b/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 diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index 5a22adf7e9..f36bae2e75 100644 --- a/frontend/platform/platform_xdk.c +++ b/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)); diff --git a/general.h b/general.h index 25c14b1aa4..eae840b2eb 100644 --- a/general.h +++ b/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]; diff --git a/media/rmenu/captain-cpsx.png b/media/rmenu/captain-cpsx.png deleted file mode 100644 index f9f6e34946dd7a77f31b910569115aef00c0c818..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17979 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 diff --git a/media/rmenu/main-menu.xcf b/media/rmenu/main-menu.xcf deleted file mode 100644 index b1d565c4db1853ce1ca1e8c7b08b045af386fdf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54690 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 diff --git a/media/rmenu/main-menu_1080p.png b/media/rmenu/main-menu_1080p.png deleted file mode 100644 index 2914dfdd9a40e131aa2d565bf905a1824cd6e0b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10695 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxV6os}1B$%3e9#$4u_bxCyDx` z7I;J!Gca%qgD@k*tT_@uLG}_)Usv|K+_H?EI-&f_<})xTFnGE+hE&{ob7!Nki=l|C z<7|Hh);}4lM!y#57O6-rSdiN&7Pg4Z%$U>nM}}Ha&E>_XfqfIz{C0pv0u=n!aNgs_xY5+IBQj!|WxkQfaRaC#U`A>d#b%`)I%7?Fj;ql+wH z&oeMoTlYQwYI9y+`~XxykjVhTaySx`t!oSweRG}_Cfvfn0}&K3)c1d14p;H=`M;mP z|Noh%e_q~vGF+SZ1t=3?F2Vps253Rc` zd}o~*qBz$F77ptS&_6*4IGjaJB`6*4FtjP~$GD`a3Y811i*R>+{@V6?wJ+B^WI c1N_YcChm<=#sA+a_kfgoy85}Sb4q9e0I19|SO5S3 diff --git a/media/xbox1/main-menu_480p.png b/media/xbox1/main-menu_480p.png deleted file mode 100644 index f610b8c3801f8c472939394aea8b88ca67ff1ce9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 716 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K59&oS$$v2KW0)P}-lDE4H!+#K5uy^@npa^Gy zM`SSr1Gg{;GcwGYBLNg-FY)wsWxvZUBw($crS++tfq^N~)5S5Q;?~<68#$Q*1za!w ze3z8QdhOfljq`i2oJd%EknIT5nH0x>97luCbAu0Y>mA;*Y8H3L79&Ou1_g!&paBfz zFzhogm+Y9$Xw>`sZ+0>p$6khQukW7a5vXG1ao)_-@`;6ok%5IlfWZOeR}kYteNX?> zpJvP{S<4@n8Zx)AE%;ssrdFjHJE-|PASs3Gp@_k9fQ16@VGk5?0t&lHaHkDgBjbNE Y+%FVP?s@il4+9W*y85}Sb4q9e0Md1JS^xk5 diff --git a/settings.c b/settings.c index ed8081db18..fa27fb1849 100644 --- a/settings.c +++ b/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);