From daa428dbe825bd92a973d5c6ab90224feab64346 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Thu, 22 Dec 2005 13:58:54 +0000
Subject: [PATCH] Add ithe enable-/disable-save-on-exit and the season options.

---
 Translations/strings-default.xml |  3 +++
 options.xml                      | 18 ++++++++++++++++++
 preferences.xml                  |  1 +
 3 files changed, 22 insertions(+)

diff --git a/Translations/strings-default.xml b/Translations/strings-default.xml
index e5ca4828a..59e10cd69 100644
--- a/Translations/strings-default.xml
+++ b/Translations/strings-default.xml
@@ -81,6 +81,8 @@
  <enable-game-mode-desc>Enable full-screen game mode</enable-game-mode-desc>
  <disable-splash-screen-desc>Disable splash screen</disable-splash-screen-desc>
  <enable-splash-screen-desc>Enable splash screen</enable-splash-screen-desc>
+ <disable-save-on-exit>Don't save preferences upon program exit</disable-save-on-exit>
+ <enable-save-on-exit>Allow saving preferences at program exit</enable-save-on-exit>
  <disable-intro-music-desc>Disable introduction music</disable-intro-music-desc>
  <enable-intro-music-desc>Enable introduction music</enable-intro-music-desc>
  <disable-mouse-pointer-desc>Disable extra mouse pointer</disable-mouse-pointer-desc>
@@ -214,6 +216,7 @@
  <!-- Time options -->
  <time-options>Time Options</time-options>
  <timeofday-desc>Specify a time of day</timeofday-desc>
+ <season-desc>Specify the startup season</season-desc>
  <time-offset-desc>Add this time offset</time-offset-desc>
  <time-match-real-desc>Synchronize time with real-world time</time-match-real-desc>
  <time-match-local-desc>Synchronize time with local real-world time</time-match-local-desc>
diff --git a/options.xml b/options.xml
index 6c86cac38..41a90a690 100644
--- a/options.xml
+++ b/options.xml
@@ -79,6 +79,18 @@
     <brief/>
    </option>
 
+   <option>
+    <name>disable-save-on-exit</name>
+    <description>strings/disable-save-on-exit</description>
+    <brief/>
+   </option>
+ 
+   <option>
+    <name>enable-save-on-exit</name>
+    <description>strings/enable-save-on-exit</description>
+    <brief/>
+   </option>
+
    <option>
     <name>disable-intro-music</name>
     <description>strings/disable-intro-music-desc</description>
@@ -497,6 +509,12 @@
     <description>strings/timeofday-desc</description>
    </option>
 
+   <option>
+    <name>season</name>
+    <arg>{summer,winter}</arg>
+    <description>strings/season-desc</description>
+   </option>
+
    <option>
     <name>time-offset</name>
     <arg>[+-]hh:mm:ss</arg>
diff --git a/preferences.xml b/preferences.xml
index f4f9e9b65..77b411781 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -36,6 +36,7 @@ Started September 2000 by David Megginson, david@megginson.com
    <game-mode type="bool">false</game-mode>
    <fullscreen type="bool">false</fullscreen>
    <units>feet</units>
+   <save-on-exit userarchive="y">true</save-on-exit>
    <browser-app>netscape</browser-app><!--  help viewer -->
   </startup>
   <rendering>