X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=068fe501f639ebaafaf5291206d4b1461f2dd978;hp=0ed66d5dd6eef94784f20ff841c0b1424599ff77;hb=f246f461993c0bed04dd6ea275a13d40345585d2;hpb=29a8c4f3e7fee7678e4b18de1748b9c4255dcef2

diff --git a/frontend/main.c b/frontend/main.c
index 0ed66d5d..068fe501 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -36,9 +36,6 @@ enum sched_action emu_action, emu_action_old;
 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)
@@ -157,9 +154,9 @@ void do_emu_action(void)
 			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:
 		{
@@ -225,12 +222,14 @@ int main(int argc, char *argv[])
 	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;
@@ -254,6 +253,10 @@ int main(int argc, char *argv[])
 
 			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")) {
@@ -291,9 +294,12 @@ int main(int argc, char *argv[])
 
 	// 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
@@ -336,6 +342,10 @@ int main(int argc, char *argv[])
 			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();