--- np2/x11/main.c	2005/03/12 12:36:13	1.22
+++ np2/x11/main.c	2007/01/23 15:48:20	1.27
@@ -142,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)) {
@@ -173,6 +173,10 @@ main(int argc, char *argv[])
 			milstr_ncpy(fontfilename, optarg, sizeof(fontfilename));
 			break;
 
+		case 'v':
+			verbose = 1;
+			break;
+
 		case 'h':
 		case '?':
 		default:
@@ -249,8 +253,6 @@ main(int argc, char *argv[])
 	mmxflag += np2oscfg.disablemmx ? MMXFLAG_DISABLE : 0;
 #endif
 
-	use_shared_pixmap = np2oscfg.shared_pixmap;
-
 	TRACEINIT();
 
 	if (fontmng_init() != SUCCESS)
@@ -278,7 +280,7 @@ main(int argc, char *argv[])
 	if (soundmng_initialize() == SUCCESS) {
 		result = soundmng_pcmload(SOUND_PCMSEEK, file_getcd("fddseek.wav"));
 		if (!result) {
-			result = soundmng_pcmload(SOUND_PCMSEEK, SYSRESPATH "/wav/fddseek.wav");
+			result = soundmng_pcmload(SOUND_PCMSEEK, SYSRESPATH "/fddseek.wav");
 		}
 		if (result) {
 			soundmng_pcmvolume(SOUND_PCMSEEK, np2cfg.MOTORVOL);
@@ -286,7 +288,7 @@ main(int argc, char *argv[])
 
 		result = soundmng_pcmload(SOUND_PCMSEEK1, file_getcd("fddseek1.wav"));
 		if (!result) {
-			result = soundmng_pcmload(SOUND_PCMSEEK1, SYSRESPATH "/wav/fddseek1.wav");
+			result = soundmng_pcmload(SOUND_PCMSEEK1, SYSRESPATH "/fddseek1.wav");
 		}
 		if (result) {
 			soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL);
@@ -332,8 +334,7 @@ main(int argc, char *argv[])
 
 	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);