(XDK1 RMenu) Build fixes

This commit is contained in:
twinaphex 2013-04-10 04:51:36 +02:00
parent 3a131cf5b8
commit 80390d8143
2 changed files with 3 additions and 3 deletions

View File

@ -1107,7 +1107,7 @@ static int select_file(uint8_t menu_type, uint64_t input)
break;
case BORDER_CHOICE:
#ifdef _XBOX1
texture_image_load(path);
texture_image_load(path, &menu_texture);
#else
texture_image_border_load(path);
#endif
@ -3066,7 +3066,7 @@ static int menu_input_process(uint8_t menu_type, uint64_t old_state)
/* TODO : need to make a 'parent' menu_type of some sort so that we have
* a cleaner way of telling RMenu that the menu stack should be popped
* for a submenu when doing the menu quit hotkey */
if (menu_type == INGAME_MENU_CORE_OPTIONS | menu_type == INGAME_MENU_RESIZE
if (menu_type == INGAME_MENU_CORE_OPTIONS || menu_type == INGAME_MENU_RESIZE
|| menu_type == LIBRETRO_CHOICE)
{
menu_stack_pop();

View File

@ -305,7 +305,7 @@ static void get_environment_settings(int argc, char *argv[])
strlcpy(default_paths.filesystem_root_dir, "D:", sizeof(default_paths.filesystem_root_dir));
strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir));
strlcpy(g_settings.screenshot_directory, "D:\\screenshots", sizeof(g_settings.screenshot_directory));
snprintf(default_paths.menu_border_file, "D:\\Media\\main-menu_480p.png", sizeof(default_paths.menu_border_file));
strlcpy(default_paths.menu_border_file, "D:\\Media\\main-menu_480p.png", sizeof(default_paths.menu_border_file));
#elif defined(_XBOX360)
strlcpy(default_paths.core_dir, "game:", sizeof(default_paths.core_dir));
strlcpy(default_paths.filesystem_root_dir, "game:\\", sizeof(default_paths.filesystem_root_dir));