--- options_string.c~	2004-10-11 10:27:23.000723664 +0000
+++ options_string.c	2004-10-11 10:29:25.014174800 +0000
@@ -207,7 +207,7 @@
 	if (strcmp((g_strstrip(target->sound_mixer_plugin)),""))
 		sound_mixer_plugin = g_strdup_printf("-sound-mixer-plugin %s",target->sound_mixer_plugin);
 
-	option_string = g_strdup_printf (" -%ssound "
+	option_string = g_strdup_printf (
 				"-%ssamples "
 				"%s "				/* fakesound */
 				"-samplefreq %i "
@@ -223,7 +223,6 @@
 				"%s "				/* QNX audio_preferred */
 				"%s "				/* dsp_plugin */
 				"%s ",				/* sound_mixer_plugin */
-				(target->sound)?"":"no",
 				(target->samples)?"":"no",
 				(target->fakesound)?"-fakesound":"",
 				target->samplefre,
@@ -385,7 +384,6 @@
 						"%s "				/* vidix */
 						"%s "				/* newext */
 						"-%sxsync "
-						"-%sprivatecmap "
 						"%s "
 						"%s "
 						"%s ",				/* Video mode */
@@ -395,7 +393,6 @@
 						vidix,
 						newext?newext:"",
 						(target->xsync)?"":"no",
-						(target->privatecmap)?"":"no",
 						xil,
 						mtxil,
 						Video_Mode_option?Video_Mode_option:""
@@ -644,7 +641,7 @@
 	    (strcmp(exec->target,"x11")==0 ||
 	     strcmp(exec->target,"SDL")==0))
 	{
-	  char *mapkey_options=strcmp(exec->target,"x11")?"sdlmapkey":"mapkey";
+	  char *mapkey_options=strcmp(exec->target,"x11")?"mapkey":"sdlmapkey";
 	  char *oldkeymap;
 	  int i;
 
@@ -701,7 +698,6 @@
 	option_string = g_strdup_printf ("-joytype %i "
 				"-%sanalogstick "
 				"%s "					/* joy */
-				"-%smouse "
 				"%s "
 				"-%susbpspad "
 				"-%srapidfire "
@@ -716,7 +712,6 @@
 				target->joytype,
 				(target->analogstick)?"":"no",
 				joy?joy:"",
-				(target->mouse)?"":"no",
 				(ctrlr)?ctrlr:"",
 				(target->usbpspad)?"":"no",
 				(target->rapidfire)?"":"no",