Removed 'mergeprops' commandline argument.

Added Alt-s key to merge current properties into stella.pro.  Together with
the Ctrl-s key which saves current properties to a new properties file,
there was no longer any need for the mergeprops argument.

Major update of the Stella manual, including the further consolidation
of the main codebase with the OSX version, as well as snapshots of the
integrated GUI.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@453 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/src/emucore/EventHandler.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: EventHandler.cxx,v 1.66 2005-05-28 22:10:43 markgrebe Exp $
+// $Id: EventHandler.cxx,v 1.67 2005-05-28 23:57:10 stephena Exp $
 //============================================================================
 
 #include <algorithm>
@@ -564,6 +564,9 @@ void EventHandler::handleKeyEvent(SDLKey key, SDLMod mod, uInt8 state)
             myOSystem->console().enableBits(true);
             break;
   #endif
+          case SDLK_s:	 // Alt-s merges properties into stella.pro
+            myOSystem->console().saveProperties(myOSystem->propertiesOutputFilename(), true);
+            break;
         }
       }
 #ifndef MAC_OSX
@@ -620,15 +623,9 @@ void EventHandler::handleKeyEvent(SDLKey key, SDLMod mod, uInt8 state)
             break;
   #endif
           case SDLK_s:	 // Ctrl-s saves properties to a file
-            // Attempt to merge with propertiesSet
-            if(myOSystem->settings().getBool("mergeprops"))
-              myOSystem->console().saveProperties(myOSystem->propertiesOutputFilename(), true);
-            else  // Save to file in base directory
-            {
-              string newPropertiesFile = myOSystem->baseDir() + BSPF_PATH_SEPARATOR +
-                myOSystem->console().properties().get("Cartridge.Name") + ".pro";
-              myOSystem->console().saveProperties(newPropertiesFile);
-            }
+            string newPropertiesFile = myOSystem->baseDir() + BSPF_PATH_SEPARATOR +
+              myOSystem->console().properties().get("Cartridge.Name") + ".pro";
+            myOSystem->console().saveProperties(newPropertiesFile);
             break;
         }
       }

stella/src/emucore/Settings.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Settings.cxx,v 1.46 2005-05-26 18:56:58 stephena Exp $
+// $Id: Settings.cxx,v 1.47 2005-05-28 23:57:10 stephena Exp $
 //============================================================================
 
 #include <cassert>
@@ -59,7 +59,6 @@ Settings::Settings(OSystem* osystem)
   set("paddle", "0");
 
   set("showinfo", "false");
-  set("mergeprops", "false");
 
   set("ssdir", "");
   set("ssname", "romname");
@@ -245,6 +244,7 @@ void Settings::usage()
     << "  -palette      <original|     Use the specified color palette\n"
     << "                 standard|\n"
     << "                 z26>\n"
+    << "  -framerate    <number>       Display the given number of frames per second\n"
   #ifdef SOUND_SUPPORT
     << "  -sound        <1|0>          Enable sound generation\n"
     << "  -fragsize     <number>       The size of sound fragments (must be a power of two)\n"
@@ -252,8 +252,6 @@ void Settings::usage()
   #endif
     << "  -paddle       <0|1|2|3>      Indicates which paddle the mouse should emulate\n"
     << "  -showinfo     <1|0>          Shows some game info\n"
-    << "  -mergeprops   <1|0>          Merge changed properties into properties file,\n"
-    << "                               or save into a separate file\n"
   #ifdef UNIX
     << "  -accurate     <1|0>          Accurate game timing (uses more CPU)\n"
   #endif