ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/prefs_items.cpp
(Generate patch)

Comparing SheepShaver/src/prefs_items.cpp (file contents):
Revision 1.7 by gbeauche, 2005-01-30T21:48:19Z vs.
Revision 1.11 by asvitkine, 2009-07-20T18:50:28Z

# Line 1 | Line 1
1   /*
2   *  prefs_items.cpp - Common preferences items
3   *
4 < *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-2008 Christian Bauer and Marc Hellwig
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 37 | Line 37 | prefs_desc common_prefs_items[] = {
37          {"scsi4", TYPE_STRING, false,       "SCSI target for Mac SCSI ID 4"},
38          {"scsi5", TYPE_STRING, false,       "SCSI target for Mac SCSI ID 5"},
39          {"scsi6", TYPE_STRING, false,       "SCSI target for Mac SCSI ID 6"},
40 +        {"screen", TYPE_STRING, false,      "video mode"},
41          {"windowmodes", TYPE_INT32, false,  "bitmap of allowed window video modes"},
42          {"screenmodes", TYPE_INT32, false,  "bitmap of allowed fullscreen video modes"},
43          {"seriala", TYPE_STRING, false,     "device name of Mac serial port A"},
# Line 53 | Line 54 | prefs_desc common_prefs_items[] = {
54          {"nogui", TYPE_BOOLEAN, false,      "disable GUI"},
55          {"noclipconversion", TYPE_BOOLEAN, false, "don't convert clipboard contents"},
56          {"ignoresegv", TYPE_BOOLEAN, false, "ignore illegal memory accesses"},
57 +        {"ignoreillegal", TYPE_BOOLEAN, false, "ignore illegal instructions"},
58          {"jit", TYPE_BOOLEAN, false,        "enable JIT compiler"},
59          {"jit68k", TYPE_BOOLEAN, false,     "enable 68k DR emulator"},
60          {"keyboardtype", TYPE_INT32, false, "hardware keyboard type"},
# Line 65 | Line 67 | prefs_desc common_prefs_items[] = {
67  
68   void AddPrefsDefaults(void)
69   {
70 + #ifndef PREFS_EDITOR
71          SysAddSerialPrefs();
72 + #endif
73          PrefsAddInt32("bootdriver", 0);
74          PrefsAddInt32("bootdrive", 0);
75          PrefsAddInt32("ramsize", 16 * 1024 * 1024);
# Line 76 | Line 80 | void AddPrefsDefaults(void)
80          PrefsAddBool("nosound", false);
81          PrefsAddBool("nogui", false);
82          PrefsAddBool("noclipconversion", false);
83 <        PrefsAddBool("ignoresegv", true);
83 >        PrefsAddBool("ignoresegv", false);
84 >        PrefsAddBool("ignoreillegal", false);
85  
86   #if USE_JIT
87          // JIT compiler specific options
# Line 86 | Line 91 | void AddPrefsDefaults(void)
91   #endif
92          PrefsAddBool("jit68k", false);
93  
94 <    PrefsAddInt32("keyboardtype", 5);
94 >        PrefsAddInt32("keyboardtype", 5);
95   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines