--- uae/src/main.c	2018/04/24 16:48:39	1.1.1.9
+++ uae/src/main.c	2018/04/24 16:56:35	1.1.1.12
@@ -21,7 +21,6 @@
 #include "memory.h"
 #include "custom.h"
 #include "serial.h"
-#include "readcpu.h"
 #include "newcpu.h"
 #include "disk.h"
 #include "debug.h"
@@ -48,6 +47,8 @@ int no_gui = 0;
 int joystickpresent = 0;
 int cloanto_rom = 0;
 
+struct gui_info gui_data;
+
 char warning_buffer[256];
 
 char optionsfile[256];
@@ -136,6 +137,8 @@ void default_prefs (struct uae_prefs *p)
 
     p->svga_no_linear = 0;
 
+    p->curses_reverse_video = 0;
+
     p->win32_middle_mouse = 0;
     p->win32_sound_style = 0;
     p->win32_sound_tweak = 0;
@@ -145,6 +148,7 @@ void default_prefs (struct uae_prefs *p)
 
     p->immediate_blits = 0;
     p->blits_32bit_enabled = 0;
+    p->collision_level = 1;
 
     strcpy (p->df[0], "df0.adf");
     strcpy (p->df[1], "df1.adf");
@@ -159,7 +163,7 @@ void default_prefs (struct uae_prefs *p)
     strcpy (p->path_floppy, "./");
     strcpy (p->path_hardfile, "./");
 
-    p->m68k_speed = 4;
+    p->m68k_speed = 0;
     p->cpu_level = 2;
     p->cpu_compatible = 0;
     p->address_space_24 = 0;
@@ -171,6 +175,8 @@ void default_prefs (struct uae_prefs *p)
     p->bogomem_size = 0x00000000;
     p->gfxmem_size = 0x00000000;
 
+    p->nr_floppies = 4;
+
     p->mountinfo = alloc_mountinfo ();
 }
 
@@ -270,6 +276,12 @@ static void fix_options (void)
     }
 #endif
 
+    if (currprefs.nr_floppies < 1 || currprefs.nr_floppies > 4) {
+	fprintf (stderr, "Invalid number of floppies.  Using 4.\n");
+	currprefs.nr_floppies = 4;
+	err = 1;
+    }
+
     if (err)
 	fprintf (stderr, "Please use \"uae -h\" to get usage information.\n");
 }
@@ -335,9 +347,11 @@ void parse_cmdline (int argc, char **arg
 	} else {
 	    if (argv[i][0] == '-' && argv[i][1] != '\0') {
 		const char *arg = argv[i] + 2;
-		if (*arg == '\0')
+		int extra_arg = *arg == '\0';
+		if (extra_arg)
 		    arg = i + 1 < argc ? argv[i + 1] : 0;
-		i += parse_cmdline_option (argv[i][1], arg);
+		if (parse_cmdline_option (argv[i][1], arg) && extra_arg)
+		    i++;
 	    }
 	}
     }