notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add gitignore, gitsubmodules
[picodrive.git]
/
platform
/
common
/
emu.c
diff --git
a/platform/common/emu.c
b/platform/common/emu.c
index
235861b
..
7d680b8
100644
(file)
--- a/
platform/common/emu.c
+++ b/
platform/common/emu.c
@@
-1012,7
+1012,7
@@
char *emu_get_save_fname(int load, int is_sram, int slot)
return NULL;
\r
}
\r
\r
return NULL;
\r
}
\r
\r
-int emu_check_save_file(int slot)
\r
+int emu_check_save_file(int slot
, int *time
)
\r
{
\r
return emu_get_save_fname(1, 0, slot) ? 1 : 0;
\r
}
\r
{
\r
return emu_get_save_fname(1, 0, slot) ? 1 : 0;
\r
}
\r
@@
-1239,7
+1239,7
@@
static void run_events_ui(unsigned int which)
if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE))
\r
{
\r
int do_it = 1;
\r
if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE))
\r
{
\r
int do_it = 1;
\r
- if ( emu_check_save_file(state_slot) &&
\r
+ if ( emu_check_save_file(state_slot
, NULL
) &&
\r
(((which & PEV_STATE_LOAD) && (currentConfig.confirm_save & EOPT_CONFIRM_LOAD)) ||
\r
((which & PEV_STATE_SAVE) && (currentConfig.confirm_save & EOPT_CONFIRM_SAVE))) )
\r
{
\r
(((which & PEV_STATE_LOAD) && (currentConfig.confirm_save & EOPT_CONFIRM_LOAD)) ||
\r
((which & PEV_STATE_SAVE) && (currentConfig.confirm_save & EOPT_CONFIRM_SAVE))) )
\r
{
\r
@@
-1258,13
+1258,13
@@
static void run_events_ui(unsigned int which)
plat_status_msg_busy_first(tmp);
\r
\r
in_set_config_int(0, IN_CFG_BLOCKING, 1);
\r
plat_status_msg_busy_first(tmp);
\r
\r
in_set_config_int(0, IN_CFG_BLOCKING, 1);
\r
- while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))
\r
+ while (in_menu_wait_any(
NULL,
50) & (PBTN_MA3|PBTN_MBACK))
\r
;
\r
;
\r
- while ( !((keys = in_menu_wait_any(50)) & (PBTN_MA3|PBTN_MBACK)) )
\r
+ while ( !((keys = in_menu_wait_any(
NULL,
50)) & (PBTN_MA3|PBTN_MBACK)) )
\r
;
\r
if (keys & PBTN_MBACK)
\r
do_it = 0;
\r
;
\r
if (keys & PBTN_MBACK)
\r
do_it = 0;
\r
- while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))
\r
+ while (in_menu_wait_any(
NULL,
50) & (PBTN_MA3|PBTN_MBACK))
\r
;
\r
in_set_config_int(0, IN_CFG_BLOCKING, 0);
\r
}
\r
;
\r
in_set_config_int(0, IN_CFG_BLOCKING, 0);
\r
}
\r
@@
-1292,7
+1292,7
@@
static void run_events_ui(unsigned int which)
}
\r
\r
emu_status_msg("SAVE SLOT %i [%s]", state_slot,
\r
}
\r
\r
emu_status_msg("SAVE SLOT %i [%s]", state_slot,
\r
- emu_check_save_file(state_slot) ? "USED" : "FREE");
\r
+ emu_check_save_file(state_slot
, NULL
) ? "USED" : "FREE");
\r
}
\r
if (which & PEV_MENU)
\r
engineState = PGS_Menu;
\r
}
\r
if (which & PEV_MENU)
\r
engineState = PGS_Menu;
\r