X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=13be9acc514e87adad71598b5419732bafb5974e;hp=1030a326ae6c2e5758d8d7439898d15c9a308bca;hb=056d67598872b0bac092878972633d6c10aa0ad6;hpb=ef94866c5ee97402b81a173093c0be4ca0daa4a0

diff --git a/frontend/main.c b/frontend/main.c
index 1030a326..13be9acc 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)
@@ -97,7 +94,7 @@ void set_cd_image(const char *fname)
 
 	if (ext && (
 	    strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 ||
-	    strcasecmp(ext, ".znx") == 0 || strcasecmp(ext, ".pbp") == 0)) {
+	    strcasecmp(ext, ".znx") == 0 /*|| strcasecmp(ext, ".pbp") == 0*/)) {
 		SetIsoFile(NULL);
 		cdrcimg_set_fname(fname);
 		strcpy(Config.Cdr, "builtin_cdrcimg");
@@ -125,6 +122,25 @@ static void set_default_paths(void)
 	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 }
 
+static void check_memcards(void)
+{
+	char buf[MAXPATHLEN];
+	FILE *f;
+	int i;
+
+	for (i = 1; i <= 9; i++) {
+		snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
+
+		f = fopen(buf, "rb");
+		if (f == NULL) {
+			printf("Creating memcard: %s\n", buf);
+			CreateMcd(buf);
+		}
+		else
+			fclose(f);
+	}
+}
+
 void do_emu_action(void)
 {
 	char buf[MAXPATHLEN];
@@ -157,9 +173,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:
 		{
@@ -216,6 +232,7 @@ int main(int argc, char *argv[])
 
 	CheckSubDir();
 	set_default_paths();
+	check_memcards();
 	strcpy(Config.Bios, "HLE");
 
 #ifdef MAEMO
@@ -225,12 +242,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 +273,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")) {
@@ -293,7 +316,10 @@ int main(int argc, char *argv[])
 	in_init();
 	//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 +362,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();
@@ -362,7 +392,7 @@ int SysInit() {
 		return -1;
 	}
 
-	LoadMcds(Config.Mcd1, Config.Mcd2);	/* TODO Do we need to have this here, or in the calling main() function?? */
+	LoadMcds(Config.Mcd1, Config.Mcd2);
 
 	if (Config.Debug) {
 		StartDebugger();