--- deliantra/server/include/config.h	2006/12/15 20:07:02	1.25
+++ deliantra/server/include/config.h	2006/12/25 14:54:44	1.29
@@ -18,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire.de
+    The authors can be reached via e-mail at crossfire@schmorp.de
 */
 
 /* This file contains various #defines that select various options.
@@ -133,7 +133,6 @@
 #define SPELL_ENCUMBRANCE TRUE
 #define SPELL_FAILURE_EFFECTS FALSE
 #define REAL_WIZ TRUE
-#define RECYCLE_TMP_MAPS FALSE
 #define RESURRECTION FALSE
 #define SEARCH_ITEMS TRUE
 #define NOT_PERMADETH TRUE
@@ -395,7 +394,7 @@
  * will override the time value set in the map, if that time is longer than
  * MAP_MAXRESET.  This value is in seconds.  If you are low on space on the
  * TMPDIR device, set this value to somethign small.  The default
- * value in the map object is MAP_DEFAULTRESET (given in seconds.)
+ * value in the map object is given in seconds.->defaultreset
  * I personally like 1 hour myself, for solo play.  It is long enough that
  * maps won't be resetting as a solve a quest, but short enough that some
  * maps (like shops and inns) will be reset during the time I play.
@@ -633,22 +632,6 @@
 
 #define AUTOSAVE 1000
 
-/* Often, emergency save fails because the memory corruption that caused
- * the crash has trashed the characters too. Define NO_EMERGENCY_SAVE
- * to disable emergency saves.  This actually does
- * prevent emergency saves now (Version 0.90.5).
- */
-
-#define NO_EMERGENCY_SAVE
-
-/* By selecting the following, whenever a player does a backup save (with
- * the 'save command), the player will be saved at home (EMERGENCY_MAP_*
- * information that is specified later).  IF this is not set, the player
- * will be saved at his present location.
- */
-
-/*#define BACKUP_SAVE_AT_HOME*/
-
 /* RESET_LOCATION_TIME is the number of seconds that must elapse before
  * we will return the player to his savebed location.  If this is zero,
  * this feature is disabled (player will resume where ever he was