Skip to content

Commit def3e95

Browse files
committed
Add progress bar setting to load_rom
Also includes example cheat settings for testing purposes.
1 parent d27833b commit def3e95

File tree

1 file changed

+25
-2
lines changed

1 file changed

+25
-2
lines changed

src/menu/views/load_rom.c

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,24 @@ static bool show_extra_info_message = false;
1111
static component_boxart_t *boxart;
1212
static char *rom_filename = NULL;
1313

14+
15+
// // Example cheat codes for the game "Majoras Mask USA"
16+
// uint32_t cheats[] = {
17+
// // Enable Code
18+
// 0xF1096820,
19+
// 0x2400,
20+
// 0xFF000220,
21+
// 0x0000,
22+
// // Inventory Editor (assigned to L)
23+
// 0xD01F9B91,
24+
// 0x0020,
25+
// 0x803FDA3F,
26+
// 0x0002,
27+
// // Last 2 entrys must be 0
28+
// 0,
29+
// 0,
30+
// };
31+
1432
static char *convert_error_message (rom_err_t err) {
1533
switch (err) {
1634
case ROM_ERR_LOAD_IO: return "I/O error during loading ROM information and/or options";
@@ -343,7 +361,12 @@ static void draw_progress (float progress) {
343361
}
344362

345363
static void load (menu_t *menu) {
346-
cart_load_err_t err = cart_load_n64_rom_and_save(menu, draw_progress);
364+
cart_load_err_t err;
365+
if (!menu->settings.loading_progress_bar_enabled) {
366+
err = cart_load_n64_rom_and_save(menu, NULL);
367+
} else {
368+
err = cart_load_n64_rom_and_save(menu, draw_progress);
369+
}
347370

348371
if (err != CART_LOAD_OK) {
349372
menu_show_error(menu, cart_load_convert_error_message(err));
@@ -362,7 +385,7 @@ static void load (menu_t *menu) {
362385
case ROM_TV_TYPE_MPAL: menu->boot_params->tv_type = BOOT_TV_TYPE_MPAL; break;
363386
default: menu->boot_params->tv_type = BOOT_TV_TYPE_PASSTHROUGH; break;
364387
}
365-
menu->boot_params->cheat_list = NULL;
388+
menu->boot_params->cheat_list = NULL; // TODO: cheats;
366389
}
367390

368391
static void deinit (void) {

0 commit comments

Comments
 (0)