--- deliantra/server/include/config.h	2007/02/16 21:38:18	1.40
+++ deliantra/server/include/config.h	2007/03/06 19:02:35	1.41
@@ -167,7 +167,7 @@
  * dont want this defined.
  */
 #ifndef DEBUG
-#define DEBUG
+# define DEBUG
 #endif
 /*
  * This option creates more core files.  In some areas, there are certain
@@ -263,43 +263,6 @@
 #define NEW_MATERIAL_CODE
 */
 
-/***********************************************************************
- * SECTION 2 - Machine/Compiler specific stuff.
- *
- * Short list of items:
- * COMPRESS_SUFFIX - selection of compression programs
- * O_NDELAY - If you don't have O_NDELAY, uncomment it.
- *
- ***********************************************************************/
-
-/*
- * If you compress your files to save space, set the COMPRESS_SUFFIX below
- * to the compression suffix you want (.Z, .gz, .bz2).  The autoconf
- * should already find the program to use.  If you set the suffix to
- * something that autoconf did not find, you are likely to have serious
- * problems, so make sure you have the appropriate compression tool installed
- * before you set this.  You can look at the autoconf.h file to see
- * what compression tools it found (search for COMPRESS).
- * Note that this is used when saving files.  Crossfire will search all
- * methods when loading a file to see if it finds a match
- */
-
-#ifndef COMPRESS_SUFFIX
-/* #define COMPRESS_SUFFIX ".Z" */
-#endif
-
-/* If you get a complaint about O_NDELAY not being known/undefined, try
- * uncommenting this.
- * This may cause problems - O_NONBLOCK will return -1 on blocking writes
- * and set error to EAGAIN.  O_NDELAY returns 0.  This is only if no bytes
- * can be written - otherwise, the number of bytes written will be returned
- * for both modes.
- */
-
-/*
-#define O_NDELAY O_NONBLOCK
-*/
-
 
 /***********************************************************************
  * Section 3
@@ -310,7 +273,6 @@
  *
  * Values:
  *
- * BANFILE - ban certain users/hosts.
  * CSPORT - port to use for new client/server
  * DMFILE - file with dm/wizard access lists
  * LOGFILE - where to log if using -daemon option
@@ -327,20 +289,11 @@
  ***********************************************************************
  */
 
-/*
- * BANFILE - file used to ban certain sites from playing.  See the example
- * ban_file for examples.
- */
-#ifndef BANFILE
-#define BANFILE         "ban_file"
-#endif
-
 /* CSPORT is the port used for the new client/server code.  Change
  * if desired.  Only of relevance if ERIC_SERVER is set above
  */
 #define CSPORT 13327 /* old port + 1 */
 
-
 /*
  * DMFILE
  * A file containing valid names that can be dm, one on each line.  See
@@ -350,7 +303,6 @@
 #define DMFILE "dm_file"
 #endif
 
-
 /* LOGFILE specifies which file to log to when playing with the
  * -daemon option.
  */
@@ -382,7 +334,6 @@
 #define SHUTDOWN_FILE "shutdown"
 #endif
 
-
 /*
  * SOCKETBUFSIZE is the size of the buffer used internally by the server for
  * storing backlogged messages for the client.  This is not operating system
@@ -401,7 +352,6 @@
  */
 #define TMPDIR "tmp"
 
-
 /* Directory to use for unique items. This is placed into the 'lib' 
  * directory.  Changing this will cause any old unique items file
  * not to be used.
@@ -419,7 +369,6 @@
 #define REGIONS	"regions"
 #define HIGHSCORE	"highscore"
 #define TREASURES	"treasures"
-#define	BANISHFILE  "banish_file"
 
 #define HIGHSCORE_LENGTH 1000	/* How many entries there are room for */
 
@@ -468,38 +417,6 @@
 #define	SAVE_DIR_MODE	0770
 
 /*
- * AUTOSAVE saves the player every AUTOSAVE ticks.  A value of
- * 5000 with MAX_TIME set at 120,000 means that the player will be
- * saved every 10 minutes.  Some effort should probably be made to
- * spread out these saves, but that might be more effort than it is
- * worth (Depending on the spacing, if enough players log on, the spacing
- * may not be large enough to save all of them.)  As it is now, it will
- * just set the base tick of when they log on, which should keep the
- * saves pretty well spread out (in a fairly random fashion.)
- */
-
-#define AUTOSAVE 1000
-
-/* 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
- * when he last logged off).  If this is set to less than two hours,
- * it will prevent players from camping out in treasure rooms.
- * Do not comment this out - it must be set to something - if you
- * comment this out, the program will not compile.
- *
- * This will work to BACKUP_SAVE_AT_HOME at home above, but where the player
- * where appear under what conditions is a little complicated depending
- * on how the player exited the game.  But if the elapsed time is greater than
- * the value below, player will always get returned to savebed location
- * location.
- * 
- * Set to one hour as default
- */
-
-#define RESET_LOCATION_TIME	3600
-
-/*
  * The message to send to clients when the server calls cleanup (on crash, shutdown, restart and so on).
  */
 #define CLEANUP_MESSAGE "The server will likely restart within the minute. Our apologies."