--- SheepShaver/src/prefs_items.cpp	2004/01/06 15:03:16	1.4
+++ SheepShaver/src/prefs_items.cpp	2009/07/20 18:50:28	1.11
@@ -1,7 +1,7 @@
 /*
  *  prefs_items.cpp - Common preferences items
  *
- *  SheepShaver (C) 1997-2002 Christian Bauer and Marc Hellwig
+ *  SheepShaver (C) 1997-2008 Christian Bauer and Marc Hellwig
  *
  *  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
@@ -37,6 +37,7 @@ prefs_desc common_prefs_items[] = {
 	{"scsi4", TYPE_STRING, false,       "SCSI target for Mac SCSI ID 4"},
 	{"scsi5", TYPE_STRING, false,       "SCSI target for Mac SCSI ID 5"},
 	{"scsi6", TYPE_STRING, false,       "SCSI target for Mac SCSI ID 6"},
+	{"screen", TYPE_STRING, false,      "video mode"},
 	{"windowmodes", TYPE_INT32, false,  "bitmap of allowed window video modes"},
 	{"screenmodes", TYPE_INT32, false,  "bitmap of allowed fullscreen video modes"},
 	{"seriala", TYPE_STRING, false,     "device name of Mac serial port A"},
@@ -53,7 +54,9 @@ prefs_desc common_prefs_items[] = {
 	{"nogui", TYPE_BOOLEAN, false,      "disable GUI"},
 	{"noclipconversion", TYPE_BOOLEAN, false, "don't convert clipboard contents"},
 	{"ignoresegv", TYPE_BOOLEAN, false, "ignore illegal memory accesses"},
+	{"ignoreillegal", TYPE_BOOLEAN, false, "ignore illegal instructions"},
 	{"jit", TYPE_BOOLEAN, false,        "enable JIT compiler"},
+	{"jit68k", TYPE_BOOLEAN, false,     "enable 68k DR emulator"},
 	{"keyboardtype", TYPE_INT32, false, "hardware keyboard type"},
 	{NULL, TYPE_END, false, NULL} // End of list
 };
@@ -64,7 +67,9 @@ prefs_desc common_prefs_items[] = {
 
 void AddPrefsDefaults(void)
 {
+#ifndef PREFS_EDITOR
 	SysAddSerialPrefs();
+#endif
 	PrefsAddInt32("bootdriver", 0);
 	PrefsAddInt32("bootdrive", 0);
 	PrefsAddInt32("ramsize", 16 * 1024 * 1024);
@@ -75,7 +80,8 @@ void AddPrefsDefaults(void)
 	PrefsAddBool("nosound", false);
 	PrefsAddBool("nogui", false);
 	PrefsAddBool("noclipconversion", false);
-	PrefsAddBool("ignoresegv", true);
+	PrefsAddBool("ignoresegv", false);
+	PrefsAddBool("ignoreillegal", false);
 
 #if USE_JIT
 	// JIT compiler specific options
@@ -83,6 +89,7 @@ void AddPrefsDefaults(void)
 #else
 	PrefsAddBool("jit", false);
 #endif
+	PrefsAddBool("jit68k", false);
 
-    PrefsAddInt32("keyboardtype", 5);
+	PrefsAddInt32("keyboardtype", 5);
 }