mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(3DS) Set bottom_asset directory default (#14376)

Browse Source 
- Fix default value while generating retroarch.cfg
- Update 'Asset not found' error message
This commit is contained in:
MrHuu 2022-09-03 20:40:01 +02:00 committed by GitHub
parent 532840c4b8
commit 835bbc6f68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configuration.c
View File

@ -3644,6 +3644,12 @@ static bool config_load_file(global_t *global,
*settings->paths.directory_core_assets = '\0';
if (string_is_equal(settings->paths.directory_assets, "default"))
*settings->paths.directory_assets = '\0';
#ifdef _3DS
if (string_is_equal(settings->paths.directory_bottom_assets, "default"))
configuration_set_string(settings,
settings->paths.directory_bottom_assets,
g_defaults.dirs[DEFAULT_DIR_BOTTOM_ASSETS]);
#endif
if (string_is_equal(settings->paths.directory_dynamic_wallpapers, "default"))
*settings->paths.directory_dynamic_wallpapers = '\0';
if (string_is_equal(settings->paths.directory_thumbnails, "default"))

34
gfx/drivers/ctr_gfx.c
View File

@ -503,8 +503,7 @@ static void bottom_menu_control(void* data, bool lcd_bottom)
return;
#endif
if ( !lcd_bottom
|| ctr->bottom_menu == CTR_BOTTOM_MENU_NOT_AVAILABLE)
if (!lcd_bottom)
{
BIT64_SET(lifecycle_state, RARCH_MENU_TOGGLE);
return;
@ -524,6 +523,13 @@ static void bottom_menu_control(void* data, bool lcd_bottom)
fadeCount = 256;
}
if (ctr->bottom_menu == CTR_BOTTOM_MENU_NOT_AVAILABLE)
{
BIT64_SET(lifecycle_state, RARCH_MENU_TOGGLE);
ctr->refresh_bottom_menu = true;
return;
}
switch (ctr->bottom_menu)
{
case CTR_BOTTOM_MENU_DEFAULT:
@ -700,14 +706,26 @@ static void ctr_render_bottom_screen(void *data)
switch (ctr->bottom_menu)
{
case CTR_BOTTOM_MENU_NOT_AVAILABLE:
params.color = COLOR_ABGR(255, 255, 255, 255);
params.scale = 1.6f;
params.x = 0.0f;
params.y = 0.5f;
{
char str_path[PATH_MAX_LENGTH];
const char *dir_assets = settings->paths.directory_bottom_assets;
font_driver_render_msg_bottom(ctr,
msg_hash_to_str(MSG_3DS_BOTTOM_MENU_ASSET_NOT_FOUND),
params.color = COLOR_ABGR(255, 255, 255, 255);
params.scale = 1.6f;
params.x = 0.0f;
params.y = 0.5f;
font_driver_render_msg_bottom(ctr,
msg_hash_to_str(MSG_3DS_BOTTOM_MENU_ASSET_NOT_FOUND),
&params);
sprintf(str_path, "%s\n/bottom_menu.png", dir_assets);
params.scale = 1.10f;
params.y -= 0.10f;
font_driver_render_msg_bottom(ctr, str_path,
&params);
}
break;
case CTR_BOTTOM_MENU_DEFAULT:
params.color = COLOR_ABGR(255, 255, 255, 255);

2
intl/msg_hash_us.h
View File

@ -13861,7 +13861,7 @@ MSG_HASH(
)
MSG_HASH(
MSG_3DS_BOTTOM_MENU_ASSET_NOT_FOUND,
"bottom_menu.png not found\nin the assets/ctr folder"
"Asset(s) not found"
)
MSG_HASH(
MSG_3DS_BOTTOM_MENU_NO_STATE_DATA,