char hud_msg[64];
int hud_new_msg;
-// from softgpu plugin
-extern int UseFrameSkip;
-
static void make_path(char *buf, size_t size, const char *dir, const char *fname)
{
if (fname)
state_slot = 9;
goto do_state_slot;
case SACTION_TOGGLE_FSKIP:
- UseFrameSkip ^= 1;
+ pl_rearmed_cbs.frameskip ^= 1;
snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s",
- UseFrameSkip ? "ON" : "OFF");
+ pl_rearmed_cbs.frameskip ? "ON" : "OFF");
break;
case SACTION_SCREENSHOT:
{
char file[MAXPATHLEN] = "";
char path[MAXPATHLEN];
const char *cdfile = NULL;
+ const char *loadst_f = NULL;
+ int psxout = 0;
int loadst = 0;
int i;
// read command line options
for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
+ if (!strcmp(argv[i], "-psxout")) psxout = 1;
else if (!strcmp(argv[i], "-load")) loadst = atol(argv[++i]);
else if (!strcmp(argv[i], "-cfg")) {
if (i+1 >= argc) break;
cdfile = isofilename;
}
+ else if (!strcmp(argv[i], "-loadf")) {
+ if (i+1 >= argc) break;
+ loadst_f = argv[++i];
+ }
else if (!strcmp(argv[i], "-h") ||
!strcmp(argv[i], "-help") ||
!strcmp(argv[i], "--help")) {
// frontend stuff
in_init();
- in_probe();
+ //in_probe();
plat_init();
- menu_init();
+ menu_init(); // loads config
+
+ if (psxout)
+ Config.PsxOut = 1;
if (LoadPlugins() == -1) {
// FIXME: this recovery doesn't work, just delete bad config and bail out
int ret = emu_load_state(loadst - 1);
printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
}
+ if (loadst_f) {
+ int ret = LoadState(loadst_f);
+ printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
+ }
}
else
menu_loop();