From 27b829ffc447758832cbd7ab2f9b7e427928d687 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Fri, 24 Nov 2017 12:04:02 -0800 Subject: Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI --HG-- branch : nuklear_ui --- sms.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'sms.c') diff --git a/sms.c b/sms.c index 45b950c..9bbad17 100644 --- a/sms.c +++ b/sms.c @@ -6,6 +6,7 @@ #include "render.h" #include "util.h" #include "debug.h" +#include "saves.h" static void *memory_io_write(uint32_t location, void *vcontext, uint8_t value) { @@ -292,20 +293,13 @@ void sms_deserialize(deserialize_buffer *buf, sms_context *sms) static void save_state(sms_context *sms, uint8_t slot) { - char *save_path; - if (slot == QUICK_SAVE_SLOT) { - save_path = save_state_path; - } else { - char slotname[] = "slot_0.state"; - slotname[5] = '0' + slot; - char const *parts[] = {sms->header.save_dir, PATH_SEP, slotname}; - save_path = alloc_concat_m(3, parts); - } + char *save_path = get_slot_name(&sms->header, slot, "state"); serialize_buffer state; init_serialize(&state); sms_serialize(sms, &state); save_to_file(&state, save_path); printf("Saved state to %s\n", save_path); + free(save_path); free(state.data); } -- cgit v1.2.3 From 01cfcb11d24235ba7b3a25c05ce1bdabe5b3015d Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sat, 25 Nov 2017 11:31:08 -0800 Subject: Get SMS savestates working in Nuklear UI --HG-- branch : nuklear_ui --- sms.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'sms.c') diff --git a/sms.c b/sms.c index 9bbad17..8e54619 100644 --- a/sms.c +++ b/sms.c @@ -318,17 +318,18 @@ static uint8_t load_state_path(sms_context *sms, char *path) static uint8_t load_state(system_header *system, uint8_t slot) { sms_context *sms = (sms_context *)system; - char numslotname[] = "slot_0.state"; - char *slotname; - if (slot == QUICK_SAVE_SLOT) { - slotname = "quicksave.state"; - } else { - numslotname[5] = '0' + slot; - slotname = numslotname; + char *statepath = get_slot_name(system, slot, "state"); + uint8_t ret; + if (!sms->z80->native_pc) { + ret = get_modification_time(statepath) != 0; + if (ret) { + system->delayed_load_slot = slot + 1; + } + goto done; + } - char const *parts[] = {sms->header.save_dir, PATH_SEP, slotname}; - char *statepath = alloc_concat_m(3, parts); - uint8_t ret = load_state_path(sms, statepath); + ret = load_state_path(sms, statepath); +done: free(statepath); return ret; } @@ -342,6 +343,11 @@ static void run_sms(system_header *system) render_set_video_standard(VID_NTSC); while (!sms->should_return) { + if (system->delayed_load_slot) { + load_state(system, system->delayed_load_slot - 1); + system->delayed_load_slot = 0; + + } if (system->enter_debugger && sms->z80->pc) { system->enter_debugger = 0; zdebugger(sms->z80, sms->z80->pc); -- cgit v1.2.3