X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmain.c;h=ed2191c8cfb715b5980b60ce30f0cf4cd94391fc;hb=a5365695a4e491413eeeca87243f776857d80913;hp=23d6241772ddc09176bc57de86faa356e208a392;hpb=4dfd9f4230a2677501756b6121024593f1b37d86;p=libpicofe.git

diff --git a/gp2x/main.c b/gp2x/main.c
index 23d6241..ed2191c 100644
--- a/gp2x/main.c
+++ b/gp2x/main.c
@@ -11,6 +11,9 @@
 
 #include "gp2x.h"
 #include "menu.h"
+#include "../common/menu.h"
+#include "../common/emu.h"
+#include "../common/config.h"
 #include "emu.h"
 #include "940ctl.h"
 #include "version.h"
@@ -63,7 +66,7 @@ void parse_cmd_line(int argc, char *argv[])
 	}
 
 	if (unrecognized) {
-		printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006\n");
+		printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-2008\n");
 		printf("usage: %s [options] [romfile]\n", argv[0]);
 		printf( "options:\n"
 				"-menu <menu_path> launch a custom program on exit instead of default gp2xmenu\n"
@@ -79,7 +82,10 @@ int main(int argc, char *argv[])
 {
 	g_argv = argv;
 
-	emu_ReadConfig(0);
+	emu_prepareDefaultConfig();
+	emu_ReadConfig(0, 0);
+	config_readlrom(PicoConfigFile);
+
 	gp2x_init();
 	if (currentConfig.EmuOpt&0x10) {
 		int ret = mmuhack();
@@ -97,6 +103,7 @@ int main(int argc, char *argv[])
 	}
 	sharedmem_init();
 	emu_Init();
+	menu_init();
 
 	engineState = PGS_Menu;
 
@@ -120,6 +127,9 @@ int main(int argc, char *argv[])
 				}
 				break;
 
+			case PGS_RestartRun:
+				engineState = PGS_Running;
+
 			case PGS_Running:
 				emu_Loop();
 				break;