--- np2/x11/main.c	2004/07/05 14:31:52	1.19
+++ np2/x11/main.c	2007/01/10 16:01:59	1.24
@@ -10,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -144,7 +142,7 @@ main(int argc, char *argv[])
 	toolkit_initialize();
 	toolkit_arginit(&argc, &argv);
 
-	while ((ch = getopt_long(argc, argv, "c:C:t:ph", longopts, NULL)) != -1) {
+	while ((ch = getopt_long(argc, argv, "c:C:t:vh", longopts, NULL)) != -1) {
 		switch (ch) {
 		case 'c':
 			if (stat(optarg, &sb) < 0 || !S_ISREG(sb.st_mode)) {
@@ -175,6 +173,10 @@ main(int argc, char *argv[])
 			milstr_ncpy(fontfilename, optarg, sizeof(fontfilename));
 			break;
 
+		case 'v':
+			verbose = 1;
+			break;
+
 		case 'h':
 		case '?':
 		default:
@@ -295,6 +297,7 @@ main(int argc, char *argv[])
 		}
 	}
 
+	joymng_initialize();
 	mousemng_initialize();
 	if (np2oscfg.MOUSE_SW) {
 		mouse_running(MOUSE_ON);
@@ -304,7 +307,6 @@ main(int argc, char *argv[])
 	sysmng_initialize();
 	taskmng_initialize();
 
-	joy_init();
 	pccore_init();
 	S98_init();
 
@@ -325,15 +327,16 @@ main(int argc, char *argv[])
 		}
 	}
 
+#if !defined(CPUCORE_IA32)
 	if (np2oscfg.resume) {
 		flagload(np2resumeext, "Resume", FALSE);
 	}
+#endif
 	sysmng_workclockreset();
 
 	drvmax = (argc < 4) ? argc : 4;
 	for (i = 0; i < drvmax; i++) {
-		milstr_ncpy(diskdrv_fname[i],argv[i],sizeof(diskdrv_fname[0]));
-		diskdrv_delay[i] = 1;
+		diskdrv_readyfdd(i, argv[i], 0);
 	}
 
 	setup_signal(SIGINT, sighandler);
@@ -349,13 +352,16 @@ main(int argc, char *argv[])
 	pccore_cfgupdate();
 
 	mouse_running(MOUSE_OFF);
+	joymng_deinitialize();
 	S98_trash();
 
+#if !defined(CPUCORE_IA32)
 	if (np2oscfg.resume) {
 		flagsave(np2resumeext);
 	} else {
 		flagdelete(np2resumeext);
 	}
+#endif
 
 	pccore_term();
 	debugwin_destroy();