The-Homebrew-Cloud/N64FlashcartMenu
2
0
Fork 0
mirror of https://github.com/Polprzewodnikowy/N64FlashcartMenu.git synced 2024-12-25 17:51:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

History and last game working

Browse Source 
Both history and last game works for roms and 64dd games
This commit is contained in:
Ross Gouldthorpe 2024-12-03 22:33:35 +00:00
parent 16bbd0c3b8
commit 0d6fe8445f
4 changed files with 70 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/menu/rom_history.c
View File

@ -5,7 +5,7 @@
#include "utils/fs.h"
#include "path.h"
#define EMULATOR_TEST true
#define EMULATOR_TEST false
static char *history_path = NULL;

14
src/menu/views/browser.c
View File

@ -416,15 +416,19 @@ static void draw (menu_t *menu, surface_t *d) {
if (menu->current_time >= 0) {
ui_components_actions_bar_text_draw(
ALIGN_CENTER, VALIGN_TOP,
"%s",
"%s" //ctime includes a newline
"<C Load Last | C> Favorite",
ctime(&menu->current_time)
);
} else {
ui_components_actions_bar_text_draw(
ALIGN_CENTER, VALIGN_TOP,
"\n"
"<C Load Last | C> Favorite"
);
}
ui_components_actions_bar_text_draw(
ALIGN_CENTER, VALIGN_BOTTOM,
"<C Load Last | C> Favorite"
);
ui_components_context_menu_draw(&entry_context_menu);

51
src/menu/views/load_disk.c
View File

@ -8,7 +8,7 @@
static bool load_disk_with_rom;
static component_boxart_t *boxart;
static char* name;
static char *convert_error_message (disk_err_t err) {
switch (err) {
@ -41,7 +41,8 @@ static void process (menu_t *menu) {
sound_play_effect(SFX_EXIT);
menu->next_mode = MENU_MODE_BROWSER;
} else if (menu->actions.favorite) {
history_favorite_add(&menu->history, menu->load.rom_path, NULL);
history_favorite_add(&menu->history, menu->load.rom_path, menu->load.disk_path);
sound_play_effect(SFX_SETTING);
}
}
@ -60,7 +61,7 @@ static void draw (menu_t *menu, surface_t *d) {
"64DD disk information\n"
"\n"
"%s",
menu->browser.entry->name
name
);
ui_components_main_text_draw(
@ -141,7 +142,7 @@ static void load (menu_t *menu) {
return;
}
history_last_rom_set(&menu->history, menu->load.rom_path, menu->load.disk_path);
history_last_rom_set(&menu->history, menu->load.disk_path, menu->load.rom_path);
menu->next_mode = MENU_MODE_BOOT;
if (load_disk_with_rom) {
@ -166,6 +167,27 @@ static void deinit (void) {
ui_components_boxart_free(boxart);
}
static bool load_rom(menu_t* menu, path_t* rom_path) {
if(path_has_value(rom_path)) {
if (menu->load.rom_path) {
path_free(menu->load.rom_path);
menu->load.rom_path = NULL;
}
menu->load.rom_path = path_clone(rom_path);
rom_err_t err = rom_info_load(rom_path, &menu->load.rom_info);
if (err != ROM_OK) {
path_free(menu->load.rom_path);
menu->load.rom_path = NULL;
menu_show_error(menu, convert_error_message(err));
return false;
}
}
return true;
}
void view_load_disk_init (menu_t *menu) {
if (menu->load.disk_path) {
path_free(menu->load.disk_path);
@ -174,10 +196,29 @@ void view_load_disk_init (menu_t *menu) {
menu->boot_pending.disk_file = false;
menu->load.disk_path = path_clone_push(menu->browser.directory, menu->browser.entry->name);
if(menu->load.load_last) {
menu->load.disk_path = path_clone(menu->history.last_disk);
if(!load_rom(menu, menu->history.last_rom)) {
return;
}
} else if(menu->load.load_favorite != -1) {
menu->load.disk_path = path_clone(menu->history.favorites_disk[menu->load.load_favorite]);
if(!load_rom(menu, menu->history.favorites_rom[menu->load.load_favorite])) {
return;
}
} else {
menu->load.disk_path = path_clone_push(menu->browser.directory, menu->browser.entry->name);
}
menu->load.load_favorite = -1;
menu->load.load_last = false;
name = path_last_get(menu->load.disk_path);
disk_err_t err = disk_info_load(menu->load.disk_path, &menu->load.disk_info);
if (err != DISK_OK) {
//snprintf(error, 256, "path : '%s' error: '%s'", path_get(menu->load.disk_path), convert_error_message(err));
menu_show_error(menu, convert_error_message(err));
return;
}

14
src/menu/views/load_rom.c
View File

@ -224,6 +224,9 @@ static void process (menu_t *menu) {
show_extra_info_message = true;
}
sound_play_effect(SFX_SETTING);
} else if (menu->actions.favorite) {
history_favorite_add(&menu->history, menu->load.rom_path, NULL);
sound_play_effect(SFX_SETTING);
}
}
@ -276,6 +279,12 @@ static void draw (menu_t *menu, surface_t *d) {
"R: Options"
);
ui_components_actions_bar_text_draw(
ALIGN_CENTER, VALIGN_TOP,
"\n"
"C>: Favorite"
);
if (boxart != NULL) {
ui_components_boxart_draw(boxart);
}
@ -336,7 +345,7 @@ static void load (menu_t *menu) {
return;
}
history_last_rom_set(&menu->history, menu->load.rom_path, NULL);
history_last_rom_set(&menu->history, NULL, menu->load.rom_path);
menu->next_mode = MENU_MODE_BOOT;
@ -374,6 +383,9 @@ void view_load_rom_init (menu_t *menu) {
name = path_last_get(menu->load.rom_path);
}
menu->load.load_favorite = -1;
menu->load.load_last = false;
rom_err_t err = rom_info_load(menu->load.rom_path, &menu->load.rom_info);
if (err != ROM_OK) {
path_free(menu->load.rom_path);