--- deliantra/server/include/config.h	2006/03/15 15:35:50	1.9
+++ deliantra/server/include/config.h	2006/12/15 20:08:45	1.26
@@ -1,9 +1,4 @@
 /*
- * static char *rcsid_config_h =
- *   "$Id$";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -23,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-devel@real-time.com
+    The authors can be reached via e-mail at crossfire@schmorp.de
 */
 
 /* This file contains various #defines that select various options.
@@ -73,7 +68,6 @@
  * MAX_TIME - how long an internal tick is in microseconds
  * MANY_CORES - generate core dumps on gross errors instead of continuing?
  * PARTY_KILL_LOG - stores party kill information
- * WATCHDOG - allows use of an external watchdog program
  *
  ***********************************************************************/
 
@@ -84,6 +78,11 @@
  */
 #define COZY_SERVER 1
 
+/*
+ * Make it impossible to pk outside the arena.
+ */
+#define PROHIBIT_PLAYERKILL 1
+
 /* Use balanced stat loss code?
  * This code is a little more merciful with repeated stat loss at lower
  * levels. Basically, the more stats you have lost, the less likely that
@@ -148,6 +147,7 @@
 #define ARMOR_WEIGHT_LINEAR TRUE
 #define ARMOR_SPEED_IMPROVEMENT 10
 #define ARMOR_SPEED_LINEAR  TRUE
+#define CREATE_HOME_PORTALS FALSE
 
 /* you can edit the ones below */
 
@@ -159,22 +159,16 @@
  * which contains usage stats for the last X amount of time.
  * CS_LOGTIME is how often it will print out stats.
  */
-#ifndef WIN32    /* ***win32 we set the following stuff in the IDE */
 #define CS_LOGSTATS
-#endif
-#ifdef CS_LOGSTATS
 #define CS_LOGTIME  600
-#endif
 
 /* DEBUG generates copious amounts of output.  I tend to change the CC options
  * in the crosssite.def file if I want this.  By default, you probably
  * dont want this defined.
  */
-#ifndef WIN32			/* ***win32 we set the following stuff in the IDE */
 #ifndef DEBUG
 #define DEBUG
 #endif
-#endif
 /*
  * This option creates more core files.  In some areas, there are certain
  * checks done to try and make the program more stable (ie, check
@@ -208,8 +202,8 @@
  * MSW 2001-05-28
  */
 
-#define MAP_CLIENT_X	25
-#define MAP_CLIENT_Y	25
+#define MAP_CLIENT_X	31
+#define MAP_CLIENT_Y	31
 
 /*
  * If you feel the game is too fast or too slow, change MAX_TIME.
@@ -260,18 +254,6 @@
 #define PERM_EXP_GAIN_RATIO           0.10f
 #define PERM_EXP_MAX_LOSS_RATIO       0.50f
 
-/*
- * WATCHDOG lets sends datagrams to port 13325 on localhost
- * in (more-or-less) regular intervals, so an external watchdog
- * program can kill the server if it hangs (for whatever reason).
- * It shouldn't hurt anyone if this is defined but you don't
- * have an watchdog program.
- */
-#ifndef WIN32	/* ***win32 disable watchdog as win32 default */
-#define WATCHDOG
-#endif
-
-
 /* Enable the new material code - it needs some work.  You can
  * enable this, and things will work, just you'll see a whole
  * bunch more materials show up, and thus a whole bunch more materials
@@ -343,7 +325,6 @@
  *    backlogged messages.
  * TMPDIR - directory to use for temp files
  * UNIQUE_DIR - directory to put unique item files into
- * USE_CALLOC for some memory requests
  ***********************************************************************
  */
 
@@ -379,12 +360,8 @@
  */
 
 #ifndef LOGFILE
-#ifdef WIN32 /* change define path */
-#define LOGFILE "var\\crossfire.log"
-#else 
 #define LOGFILE "/var/log/crossfire/logfile"
 #endif
-#endif
 
 /*
  * MAP_MAXTIMEOUT tells the maximum of ticks until a map is swapped out
@@ -409,9 +386,9 @@
  */
 
 /* How many ticks till maps are swapped out */
-#define MAP_MAXTIMEOUT	1000
+#define MAP_MAXTIMEOUT	300
 /* At least that many ticks before swapout */
-#define MAP_MINTIMEOUT  500
+#define MAP_MINTIMEOUT  300
 
 /*
  * MAP_MAXRESET is the maximum time a map can have before being reset.  It
@@ -429,7 +406,7 @@
 /* Maximum time to reset. */
 #define MAP_MAXRESET	7200
 /* Default time to reset. */
-#define MAP_DEFAULTRESET       7200
+#define MAP_DEFAULTRESET       3600
 
 /*
  * MAX_OBJECTS is no hard limit.  If this limit is exceeded, crossfire
@@ -445,7 +422,7 @@
  * 25000 is about 8.5 MB
  */
 
-#define MAX_OBJECTS	100000
+#define MAX_OBJECTS	400000
 
 /*
  * Max objects low water mark (lwm).  If defined, the map swapping strategy
@@ -528,7 +505,7 @@
  * warranted.
  */
 
-#define SOCKETBUFSIZE 128*1024
+#define SOCKETBUFSIZE 256*1024
 
 /*
  * Your tmp-directory should be large enough to hold the uncompressed
@@ -542,11 +519,7 @@
  */
 
 /*#define TMPDIR "/home/hugin/a/crossfire/crossfire/tmp"*/
-#ifdef WIN32 /* change define path tmp */
-#define TMPDIR "tmp"
-#else
 #define TMPDIR "/tmp"
-#endif
 
 
 /* Directory to use for unique items. This is placed into the 'lib' 
@@ -556,36 +529,14 @@
 #define UNIQUE_DIR "unique-items"
 
 /*
- * If undefined, malloc is always used.
- * It looks like this can be oboleted.  However, it can be useful to
- * track down some bugs, as it will make sure that the entire data structure
- * is set to 0, at the expense of speed.
- * Rupert Goldie has run Purify against the code, and if this is disabled,
- * apparantly there are a lot of uninitialized memory reads - I haven't
- * seen any problem (maybe the memory reads are copies, and the destination
- * doesn't actually use the garbage values either?), but the impact on speed
- * of using this probably isn't great, and should make things more stable.
- * Msw 8-9-97
- */
-#define USE_CALLOC
-
-
-/*
  * These define the players starting map and location on that map, and where
  * emergency saves are defined.  This should be left as is unless you make
  * major changes to the map.
  */
 
-#ifdef WIN32 /* change define path city */
-
-#  define EMERGENCY_MAPPATH "\\city\\city"
-#  define EMERGENCY_X 15
-#  define EMERGENCY_Y 19
-#else
-#  define EMERGENCY_MAPPATH "/city/city"
-#  define EMERGENCY_X 15
-#  define EMERGENCY_Y 19
-#endif
+#define EMERGENCY_MAPPATH "/city/city"
+#define EMERGENCY_X 15
+#define EMERGENCY_Y 19
 
 
 /*
@@ -602,8 +553,7 @@
 #define	BANISHFILE  "banish_file"
 
 #define MAX_ERRORS	25	/* Bail out if more are received during tick */
-#define STARTMAX        500     /* How big array of objects to start with */
-#define OBJ_EXPAND      100     /* How big steps to use when expanding array */
+#define OBJ_EXPAND      5000    /* How big steps to use when expanding array */
 
 #define HIGHSCORE_LENGTH 1000	/* How many entries there are room for */
 
@@ -681,7 +631,7 @@
  * saves pretty well spread out (in a fairly random fashion.)
  */
 
-#define AUTOSAVE 500
+#define AUTOSAVE 1000
 
 /* Often, emergency save fails because the memory corruption that caused
  * the crash has trashed the characters too. Define NO_EMERGENCY_SAVE
@@ -700,7 +650,7 @@
 /*#define BACKUP_SAVE_AT_HOME*/
 
 /* RESET_LOCATION_TIME is the number of seconds that must elapse before
- * we fill return the player to his savebed location.  If this is zero,
+ * 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.