--- BasiliskII/src/prefs.cpp	1999/10/19 17:41:18	1.2
+++ BasiliskII/src/prefs.cpp	2000/04/14 19:03:48	1.5
@@ -1,7 +1,7 @@
 /*
  *  prefs.cpp - Preferences handling
  *
- *  Basilisk II (C) 1997-1999 Christian Bauer
+ *  Basilisk II (C) 1997-2000 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -49,12 +49,13 @@ prefs_desc common_prefs_items[] = {
 	{"serialb", TYPE_STRING, false},	// Device name of Mac serial port B (serial_*.cpp)
 	{"ether", TYPE_STRING, false},		// Device name of Mac ethernet adapter (ether_*.cpp)
 	{"rom", TYPE_STRING, false},		// Path of ROM file (main_*.cpp)
-	{"bootdrive", TYPE_INT16, false},	// Boot drive number (main_*.cpp)
-	{"bootdriver", TYPE_INT16, false},	// Boot driver number (main_*.cpp)
+	{"bootdrive", TYPE_INT16, false},	// Boot drive number (main.cpp)
+	{"bootdriver", TYPE_INT16, false},	// Boot driver number (main.cpp)
 	{"ramsize", TYPE_INT32, false},		// Size of Mac RAM in bytes (main_*.cpp)
 	{"frameskip", TYPE_INT32, false},	// Number of frames to skip in refreshed video modes (video_*.cpp)
 	{"modelid", TYPE_INT32, false},		// Mac Model ID (Gestalt Model ID minus 6) (rom_patches.cpp)
-	{"fpu", TYPE_BOOLEAN, false},		// Enable FPU emulation (main_*.cpp)
+	{"cpu", TYPE_INT32, false},			// CPU type (0 = 68000, 1 = 68010 etc.) (main.cpp)
+	{"fpu", TYPE_BOOLEAN, false},		// Enable FPU emulation (main.cpp)
 	{"nocdrom", TYPE_BOOLEAN, false},	// Don't install CD-ROM driver (cdrom.cpp/rom_patches.cpp)
 	{"nosound", TYPE_BOOLEAN, false},	// Don't enable sound output (audio_*.cpp)
 	{"nogui", TYPE_BOOLEAN, false},		// Disable GUI (main_*.cpp)
@@ -90,6 +91,7 @@ void PrefsInit(void)
 	PrefsAddInt32("ramsize", 8 * 1024 * 1024);
 	PrefsAddInt32("frameskip", 6);
 	PrefsAddInt32("modelid", 5);	// Mac IIci
+	PrefsAddInt32("cpu", 3);		// 68030
 	PrefsAddBool("fpu", false);
 	PrefsAddBool("nocdrom", false);
 	PrefsAddBool("nosound", false);
@@ -331,8 +333,6 @@ void LoadPrefsFromStream(FILE *f)
 
 		// Skip whitespace until value
 		while (isspace(*p)) p++;
-		if (*p == 0)
-			continue;
 		char *keyword = line;
 		char *value = p;
 		int32 i = atol(value);