From a1eecbfcc5ff16188cbb8a53da6feefe0f19137d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 4 Aug 2012 07:24:15 +0200 Subject: [PATCH] (Xbox 1) Ifdef out PATH_CHEATS if HAVE_XML is not defined --- console/rmenu/rmenu.c | 18 ++++++++++++++++++ console/rmenu/rmenu.h | 4 ++++ console/rmenu/rmenu_entries.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c index 2f6bd3d51c..1d9cf65cdf 100644 --- a/console/rmenu/rmenu.c +++ b/console/rmenu/rmenu.c @@ -320,10 +320,12 @@ static void set_setting_label(menu * current_menu, item *items, unsigned current set_setting_label_color(items,!(strcmp(g_console.default_sram_dir, default_paths.port_dir)), currentsetting); snprintf(items[currentsetting].setting_text, sizeof(items[currentsetting].setting_text), g_console.default_sram_dir); break; +#ifdef HAVE_XML case SETTING_PATH_CHEATS: set_setting_label_color(items,!(strcmp(g_settings.cheat_database, default_paths.port_dir)), currentsetting); snprintf(items[currentsetting].setting_text, sizeof(items[currentsetting].setting_text), g_settings.cheat_database); break; +#endif case SETTING_PATH_SYSTEM: set_setting_label_color(items,!(strcmp(g_settings.system_directory, default_paths.system_dir)), currentsetting); snprintf(items[currentsetting].setting_text, sizeof(items[currentsetting].setting_text), g_settings.system_directory); @@ -508,7 +510,9 @@ static void menu_stack_push(item *items, unsigned menu_id) case PATH_DEFAULT_ROM_DIR_CHOICE: case PATH_SAVESTATES_DIR_CHOICE: case PATH_SRAM_DIR_CHOICE: +#ifdef HAVE_XML case PATH_CHEATS_DIR_CHOICE: +#endif case PATH_SYSTEM_DIR_CHOICE: strlcpy(current_menu->title, "Path Selection", sizeof(current_menu->title)); current_menu->enum_id = menu_id; @@ -628,7 +632,9 @@ static void display_menubar(menu *current_menu) case INPUT_PRESET_CHOICE: case PATH_SAVESTATES_DIR_CHOICE: case PATH_DEFAULT_ROM_DIR_CHOICE: +#ifdef HAVE_XML case PATH_CHEATS_DIR_CHOICE: +#endif case PATH_SRAM_DIR_CHOICE: render_msg_place_func(x_position, 0.03f, font_size, WHITE, "<- PREV"); break; @@ -645,7 +651,9 @@ static void display_menubar(menu *current_menu) case INPUT_PRESET_CHOICE: case PATH_SAVESTATES_DIR_CHOICE: case PATH_DEFAULT_ROM_DIR_CHOICE: +#ifdef HAVE_XML case PATH_CHEATS_DIR_CHOICE: +#endif case PATH_SRAM_DIR_CHOICE: fb = &tmpBrowser; case FILE_BROWSER_MENU: @@ -910,9 +918,11 @@ static void select_directory(item *items, menu *current_menu, uint64_t input) case PATH_DEFAULT_ROM_DIR_CHOICE: strlcpy(g_console.default_rom_startup_dir, path, sizeof(g_console.default_rom_startup_dir)); break; +#ifdef HAVE_XML case PATH_CHEATS_DIR_CHOICE: strlcpy(g_settings.cheat_database, path, sizeof(g_settings.cheat_database)); break; +#endif } menu_stack_decrement(); } @@ -931,9 +941,11 @@ static void select_directory(item *items, menu *current_menu, uint64_t input) case PATH_DEFAULT_ROM_DIR_CHOICE: strlcpy(g_console.default_rom_startup_dir, path, sizeof(g_console.default_rom_startup_dir)); break; +#ifdef HAVE_XML case PATH_CHEATS_DIR_CHOICE: strlcpy(g_settings.cheat_database, path, sizeof(g_settings.cheat_database)); break; +#endif } menu_stack_decrement(); @@ -1515,6 +1527,7 @@ static void producesettingentry(menu *current_menu, item *items, unsigned switch if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_console.default_sram_dir, default_paths.sram_dir, sizeof(g_console.default_sram_dir)); break; +#ifdef HAVE_XML case SETTING_PATH_CHEATS: if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { @@ -1529,6 +1542,7 @@ static void producesettingentry(menu *current_menu, item *items, unsigned switch if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_settings.cheat_database, default_paths.port_dir, sizeof(g_settings.cheat_database)); break; +#endif case SETTING_PATH_SYSTEM: if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { @@ -1572,7 +1586,9 @@ static void producesettingentry(menu *current_menu, item *items, unsigned switch { strlcpy(g_console.default_rom_startup_dir, "/", sizeof(g_console.default_rom_startup_dir)); strlcpy(g_console.default_savestate_dir, default_paths.port_dir, sizeof(g_console.default_savestate_dir)); +#ifdef HAVE_XML strlcpy(g_settings.cheat_database, default_paths.port_dir, sizeof(g_settings.cheat_database)); +#endif strlcpy(g_console.default_sram_dir, "", sizeof(g_console.default_sram_dir)); menu_stack_refresh(items, current_menu); @@ -2452,7 +2468,9 @@ void menu_loop(void) break; case PATH_SAVESTATES_DIR_CHOICE: case PATH_DEFAULT_ROM_DIR_CHOICE: +#ifdef HAVE_XML case PATH_CHEATS_DIR_CHOICE: +#endif case PATH_SRAM_DIR_CHOICE: select_directory(rmenu_items, current_menu, trig_state); fb = &tmpBrowser; diff --git a/console/rmenu/rmenu.h b/console/rmenu/rmenu.h index ff99b31f72..073e1b0e62 100644 --- a/console/rmenu/rmenu.h +++ b/console/rmenu/rmenu.h @@ -106,7 +106,9 @@ enum LIBRETRO_CHOICE, PATH_SAVESTATES_DIR_CHOICE, PATH_DEFAULT_ROM_DIR_CHOICE, +#ifdef HAVE_XML PATH_CHEATS_DIR_CHOICE, +#endif PATH_SRAM_DIR_CHOICE, PATH_SYSTEM_DIR_CHOICE, INPUT_PRESET_CHOICE, @@ -160,7 +162,9 @@ enum SETTING_PATH_DEFAULT_ROM_DIRECTORY, SETTING_PATH_SAVESTATES_DIRECTORY, SETTING_PATH_SRAM_DIRECTORY, +#ifdef HAVE_XML SETTING_PATH_CHEATS, +#endif SETTING_PATH_SYSTEM, SETTING_ENABLE_SRAM_PATH, SETTING_ENABLE_STATE_PATH, diff --git a/console/rmenu/rmenu_entries.h b/console/rmenu/rmenu_entries.h index 80f4332aca..2c881a7a8f 100644 --- a/console/rmenu/rmenu_entries.h +++ b/console/rmenu/rmenu_entries.h @@ -356,6 +356,7 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = "INFO - Set the default SRAM (SaveRAM) directory path. All the\nbattery backup saves will be stored in this directory.", WHITE, }, +#ifdef HAVE_XML { SETTING_PATH_CHEATS, "Cheatfile Directory", @@ -366,6 +367,7 @@ item rmenu_items[MAX_NO_OF_CONTROLS_SETTINGS] = "INFO - Set the default [Cheatfile directory] path. All CHT (cheat) files\nwill be stored here.", WHITE, }, +#endif { SETTING_PATH_SYSTEM, "System Directory",